Fix 'gcc -Wextra -Wno-unused-parameter'.

diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index 626aa0bd11150f32a3218c4c12248922607b1e55..bdd012fc114a7c3ae08067d22657f9251f146176 100644 (file)
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -453,7 +453,7 @@ static char *resolve_tilde(const char *path) {
     char *head, *tail, *result;
 
     tail = strchr(path, '/');
-    head = strndup(path, tail ? tail - path : strlen(path));
+    head = strndup(path, tail ? (size_t)(tail - path) : strlen(path));
 
     int res = glob(head, GLOB_TILDE, NULL, &globbuf);
     free(head);

diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index f0dd407ff5dc87cc4e8267fff77d12bbc91a08ae..fea2e688c13e8119d70fc1a361d7b541f87fc92e 100644 (file)
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -467,7 +467,8 @@ int main(int argc, char *argv[]) {
         uint32_t top_end_x;
         uint32_t bottom_start_x;
         uint32_t bottom_end_x;
-    } __attribute__((__packed__)) strut_partial = {};
+    } __attribute__((__packed__)) strut_partial;
+    memset(&strut_partial, 0, sizeof(strut_partial));
 
     strut_partial.top = font.height + 6;
     strut_partial.top_start_x = 0;

diff --git a/i3bar/include/config.h b/i3bar/include/config.h
index 3d2a854b842b4165442c873e8b1bc14fb32efd1b..e0b0efee1631dc91f2944159cee4246a6fca5f21 100644 (file)
--- a/i3bar/include/config.h
+++ b/i3bar/include/config.h
@@ -17,6 +17,9 @@ typedef enum {
     POS_BOT
 } position_t;
 
+/* Bar display mode (hide unless modifier is pressed or show in dock mode or always hide in invisible mode) */
+typedef enum { M_DOCK = 0, M_HIDE = 1, M_INVISIBLE = 2 } bar_display_mode_t;
+
 typedef struct config_t {
     int          modifier;
     position_t   position;
@@ -31,8 +34,7 @@ typedef struct config_t {
     int          num_outputs;
     char         **outputs;
 
-    /* Bar display mode (hide unless modifier is pressed or show in dock mode or always hide in invisible mode) */
-    enum { M_DOCK = 0, M_HIDE = 1, M_INVISIBLE = 2 } hide_on_modifier;
+    bar_display_mode_t hide_on_modifier;
 
     /* The current hidden_state of the bar, which indicates whether it is hidden or shown */
     enum { S_HIDE = 0, S_SHOW = 1 } hidden_state;

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 52019b368611753be6d7d08352da1d27fbcc98ca..63e26f1bdcce697e26b1778e08fabab94225dc71 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -28,7 +28,7 @@
 #include "common.h"
 
 /* Global variables for child_*() */
-i3bar_child child = {};
+i3bar_child child;
 
 /* stdin- and sigchild-watchers */
 ev_io    *stdin_io;

diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c
index 9ec9100bfd63ac6765b144fd79d944011953d510..6a2c0e625d0972e5d7391e7fc12dca29c5b89485 100644 (file)
--- a/i3bar/src/ipc.c
+++ b/i3bar/src/ipc.c
@@ -161,7 +161,7 @@ void got_bar_config_update(char *event) {
 
     /* update the configuration with the received settings */
     DLOG("Received bar config update \"%s\"\n", event);
-    int old_mode = config.hide_on_modifier;
+    bar_display_mode_t old_mode = config.hide_on_modifier;
     parse_config_json(event);
     if (old_mode != config.hide_on_modifier) {
         reconfig_windows(true);

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index faae27d17ed62288ec19e30e0378c76f9a1273c8..f3eaa54745c6bf3129cdac610023cde3f99ef2ac 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -1524,7 +1524,9 @@ void reconfig_windows(bool redraw_bars) {
                 uint32_t top_end_x;
                 uint32_t bottom_start_x;
                 uint32_t bottom_end_x;
-            } __attribute__((__packed__)) strut_partial = {};
+            } __attribute__((__packed__)) strut_partial;
+            memset(&strut_partial, 0, sizeof(strut_partial));
+
             switch (config.position) {
                 case POS_NONE:
                     break;

diff --git a/include/con.h b/include/con.h
index 49ee97f6e43bc53f7e1b221966d8f17567387121..0205dfc6ea037936161444931ee33177667111db 100644 (file)
--- a/include/con.h
+++ b/include/con.h
@@ -80,7 +80,7 @@ Con *con_parent_with_orientation(Con *con, orientation_t orientation);
  * Returns the first fullscreen node below this node.
  *
  */
-Con *con_get_fullscreen_con(Con *con, int fullscreen_mode);
+Con *con_get_fullscreen_con(Con *con, fullscreen_mode_t fullscreen_mode);
 
 /**
  * Returns true if the container is internal, such as __i3_scratch
@@ -192,7 +192,7 @@ void con_move_to_workspace(Con *con, Con *workspace, bool fix_coordinates, bool
  * container).
  *
  */
-int con_orientation(Con *con);
+orientation_t con_orientation(Con *con);
 
 /**
  * Returns the container which will be focused next when the given container

diff --git a/include/data.h b/include/data.h
index 659a362b05e4b09f47f21d037fa02b39b97ef0f5..8a44fb1d49ce6f249166d5769c6ee4c528ef2e90 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -449,6 +449,9 @@ struct Assignment {
     TAILQ_ENTRY(Assignment) assignments;
 };
 
+/** Fullscreen modes. Used by Con.fullscreen_mode. */
+typedef enum { CF_NONE = 0, CF_OUTPUT = 1, CF_GLOBAL = 2 } fullscreen_mode_t;
+
 /**
  * A 'Con' represents everything from the X11 root window down to a single X11 window.
  *
@@ -537,7 +540,7 @@ struct Con {
 
     TAILQ_HEAD(swallow_head, Match) swallow_head;
 
-    enum { CF_NONE = 0, CF_OUTPUT = 1, CF_GLOBAL = 2 } fullscreen_mode;
+    fullscreen_mode_t fullscreen_mode;
     /* layout is the layout of this container: one of split[v|h], stacked or
      * tabbed. Special containers in the tree (above workspaces) have special
      * layouts like dockarea or output.

diff --git a/src/con.c b/src/con.c
index ba14e06c66028083c46da87a16c5f7ed0dc75562..5a3c88d21ce0bd8dff731ff8e3df44c8a8a40f6e 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -353,7 +353,7 @@ struct bfs_entry {
  * Returns the first fullscreen node below this node.
  *
  */
-Con *con_get_fullscreen_con(Con *con, int fullscreen_mode) {
+Con *con_get_fullscreen_con(Con *con, fullscreen_mode_t fullscreen_mode) {
     Con *current, *child;
 
     /* TODO: is breadth-first-search really appropriate? (check as soon as
@@ -826,7 +826,7 @@ void con_move_to_workspace(Con *con, Con *workspace, bool fix_coordinates, bool
  * container).
  *
  */
-int con_orientation(Con *con) {
+orientation_t con_orientation(Con *con) {
     switch (con->layout) {
         case L_SPLITV:
         /* stacking containers behave like they are in vertical orientation */

diff --git a/src/util.c b/src/util.c
index 877017578074b08ceab583fd092559480a817fb1..f672cc2e994b1ff86c4d8b9f6eda165609a70d90 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -130,7 +130,7 @@ char *resolve_tilde(const char *path) {
         char *head, *tail, *result;
 
         tail = strchr(path, '/');
-        head = strndup(path, tail ? tail - path : strlen(path));
+        head = strndup(path, tail ? (size_t)(tail - path) : strlen(path));
 
         int res = glob(head, GLOB_TILDE, NULL, &globbuf);
         free(head);