Removed unneeded function; also some minor comment improvmenets.

diff --git a/src/wincontrol.c b/src/wincontrol.c
index ff0ce5dbf2d05d89360d2b35715716c5dea19a43..7a4cdbd04e6f3223cece4deee95d80430726c314 100644 (file)
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -30,7 +30,7 @@ static char * string_prefixed_id(struct World * world, char * prefix, char id);
 
 
 /* Create Winconf, initialize ->view/height_type/width_type to 0, ->id to "id"
- * and ->draw to f.
+ * and ->draw to "f".
  */
 static void create_winconf(char id, struct WinConf * wcp,
                            void (* f) (struct Win *));
@@ -55,7 +55,6 @@ static void set_winconf(struct World * world, char id);
 
 /* Get WinConf by "id"; get id of WinConf mothering "win". */
 static struct WinConf * get_winconf_by_id(struct World * world, char id);
-static char get_id_by_win(struct World * world, struct Win * win);
 
 
 
@@ -194,14 +193,6 @@ static struct WinConf * get_winconf_by_id(struct World * world, char id)
 
 
 
-static char get_id_by_win(struct World * world, struct Win * win)
-{
-    struct WinConf * wc = get_winconf_by_win(world, win);
-    return wc->id;
-}
-
-
-
 extern struct WinConf * get_winconf_by_win(struct World * world,
                                            struct Win * win)
 {
@@ -334,7 +325,8 @@ extern void save_win_configs(struct World * world)
     uint8_t i = 0;
     while (0 != w_p)
     {
-        line[i] = get_id_by_win(world, w_p);
+        struct WinConf * wc = get_winconf_by_win(world, w_p);
+        line[i] = wc->id;
         w_p = w_p->_next;
         i++;
     }

diff --git a/src/wincontrol.h b/src/wincontrol.h
index f56bc39b6a94987d75c922c2ba21c076a685b0c5..b5ccbb53d3e78fc17deff17b8d95d8715256e156 100644 (file)
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -9,7 +9,7 @@
 
 
 
-#include <stdint.h> /* for uint8_t */
+#include <stdint.h> /* for uint8_t, int16_t */
 struct Win;
 struct WinMeta;
 struct World;