Fix clang -Wextra except -Wunused-parameter.

Cleared all warnings that occur when passing
CFLAGS="-Wall -Wextra -Wno-unused-parameter" to make using clang 3.3 on
Linux x86-64.

diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index 09b94841d28430db851e25bf316d94b85de4cad1..626aa0bd11150f32a3218c4c12248922607b1e55 100644 (file)
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -299,7 +299,7 @@ static char *rewrite_binding(const char *input) {
 
     /* The "<=" operator is intentional: We also handle the terminating 0-byte
      * explicitly by looking for an 'end' token. */
-    while ((walk - input) <= len) {
+    while ((size_t)(walk - input) <= len) {
         /* Skip whitespace before every token, newlines are relevant since they
          * separate configuration directives. */
         while ((*walk == ' ' || *walk == '\t') && *walk != '\0')

diff --git a/i3-msg/main.c b/i3-msg/main.c
index 935edc0467609a330ce6d3640778ab4f61bd764c..11a31972eb1d002b4e83647511d980d495be98a4 100644 (file)
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -135,7 +135,7 @@ yajl_callbacks reply_callbacks = {
 int main(int argc, char *argv[]) {
     socket_path = getenv("I3SOCK");
     int o, option_index = 0;
-    int message_type = I3_IPC_MESSAGE_TYPE_COMMAND;
+    uint32_t message_type = I3_IPC_MESSAGE_TYPE_COMMAND;
     char *payload = NULL;
     bool quiet = false;
 

diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index 791da97bb5b19ef016e1b63ba90f32b2357cade3..f0dd407ff5dc87cc4e8267fff77d12bbc91a08ae 100644 (file)
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -467,7 +467,7 @@ 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 = {0,};
+    } __attribute__((__packed__)) strut_partial = {};
 
     strut_partial.top = font.height + 6;
     strut_partial.top_start_x = 0;

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 16d3e0912f1de606e48ecd799a0b308e50326c1c..52019b368611753be6d7d08352da1d27fbcc98ca 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 = { 0 };
+i3bar_child child = {};
 
 /* stdin- and sigchild-watchers */
 ev_io    *stdin_io;

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 828610394dfe64dabb3059a9e6badece41b3aeb8..faae27d17ed62288ec19e30e0378c76f9a1273c8 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -417,7 +417,7 @@ void handle_button(xcb_button_press_event_t *event) {
     const size_t len = namelen + strlen("workspace \"\"") + 1;
     char *buffer = scalloc(len+num_quotes);
     strncpy(buffer, "workspace \"", strlen("workspace \""));
-    int inpos, outpos;
+    size_t inpos, outpos;
     for (inpos = 0, outpos = strlen("workspace \"");
          inpos < namelen;
          inpos++, outpos++) {
@@ -1524,7 +1524,7 @@ 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 = {0,};
+            } __attribute__((__packed__)) strut_partial = {};
             switch (config.position) {
                 case POS_NONE:
                     break;
@@ -1717,7 +1717,7 @@ void draw_bars(bool unhide) {
                           outputs_walk->bargc,
                           MAX(0, (int16_t)(statusline_width - outputs_walk->rect.w + 4)), 0,
                           MAX(0, (int16_t)(outputs_walk->rect.w - statusline_width - traypx - 4)), 3,
-                          MIN(outputs_walk->rect.w - traypx - 4, statusline_width), font.height + 2);
+                          MIN(outputs_walk->rect.w - traypx - 4, (int)statusline_width), font.height + 2);
         }
 
         if (!config.disable_ws) {

diff --git a/include/randr.h b/include/randr.h
index 75c899c3acc3de6ddb807ed1b5901c13c7d24b35..43f7efe826ae26820842aa5a67fc10ea67a614cc 100644 (file)
--- a/include/randr.h
+++ b/include/randr.h
@@ -84,7 +84,7 @@ Output *get_output_by_name(const char *name);
  * if there is no output which contains these coordinates.
  *
  */
-Output *get_output_containing(int x, int y);
+Output *get_output_containing(unsigned int x, unsigned int y);
 
 /*
  * In contained_by_output, we check if any active output contains part of the container.

diff --git a/libi3/get_exe_path.c b/libi3/get_exe_path.c
index e0437e5e501a727e9e26ebf8f9f4f537e12bd4b8..032ea3dacf60ac799b9c683d25fef892c6b75561 100644 (file)
--- a/libi3/get_exe_path.c
+++ b/libi3/get_exe_path.c
@@ -30,7 +30,7 @@ char *get_exe_path(const char *argv0) {
 #endif
        ssize_t linksize;
 
-       while ((linksize = readlink(exepath, destpath, destpath_size)) == destpath_size) {
+       while ((linksize = readlink(exepath, destpath, destpath_size)) == (ssize_t)destpath_size) {
                destpath_size = destpath_size * 2;
                destpath = srealloc(destpath, destpath_size);
        }

diff --git a/libi3/ipc_send_message.c b/libi3/ipc_send_message.c
index c5560c0de9789aef20e27ec667cfd36c7ce0464a..0c360c9c5e47628e3e8becf61e96b47a2eefa7db 100644 (file)
--- a/libi3/ipc_send_message.c
+++ b/libi3/ipc_send_message.c
@@ -33,7 +33,7 @@ int ipc_send_message(int sockfd, const uint32_t message_size,
         .type = message_type
     };
 
-    int sent_bytes = 0;
+    size_t sent_bytes = 0;
     int n = 0;
 
     /* This first loop is basically unnecessary. No operating system has

diff --git a/src/assignments.c b/src/assignments.c
index 655816a3bc0ffd1ad464c92a3adbffe0f7c42c26..ea39eafa77e1d038d6b41636ebe43189d036f941 100644 (file)
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -28,7 +28,7 @@ void run_assignments(i3Window *window) {
             continue;
 
         bool skip = false;
-        for (int c = 0; c < window->nr_assignments; c++) {
+        for (uint32_t c = 0; c < window->nr_assignments; c++) {
             if (window->ran_assignments[c] != current)
                 continue;
 

diff --git a/src/click.c b/src/click.c
index a517838a9a02f42ba900a60cdf6eab4908375ab2..b6eb948c66cfb93593e16d331ea99945596f9ad6 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -147,15 +147,15 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click
         return tiling_resize_for_border(con, BORDER_TOP, event);
     }
 
-    if (event->event_x >= 0 && event->event_x <= bsr.x &&
-        event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height)
+    if (event->event_x >= 0 && event->event_x <= (int32_t)bsr.x &&
+        event->event_y >= (int32_t)bsr.y && event->event_y <= (int32_t)(con->rect.height + bsr.height))
         return tiling_resize_for_border(con, BORDER_LEFT, event);
 
-    if (event->event_x >= (con->window_rect.x + con->window_rect.width) &&
-        event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height)
+    if (event->event_x >= (int32_t)(con->window_rect.x + con->window_rect.width) &&
+        event->event_y >= (int32_t)bsr.y && event->event_y <= (int32_t)(con->rect.height + bsr.height))
         return tiling_resize_for_border(con, BORDER_RIGHT, event);
 
-    if (event->event_y >= (con->window_rect.y + con->window_rect.height))
+    if (event->event_y >= (int32_t)(con->window_rect.y + con->window_rect.height))
         return tiling_resize_for_border(con, BORDER_BOTTOM, event);
 
     return false;

diff --git a/src/commands_parser.c b/src/commands_parser.c
index 4f04501c21408d02930e43c4285d9c20f03cc78e..05d39cff53790ef42ed61ab1e896a137f19a3984 100644 (file)
--- a/src/commands_parser.c
+++ b/src/commands_parser.c
@@ -232,7 +232,7 @@ struct CommandResult *parse_command(const char *input) {
 
     /* The "<=" operator is intentional: We also handle the terminating 0-byte
      * explicitly by looking for an 'end' token. */
-    while ((walk - input) <= len) {
+    while ((size_t)(walk - input) <= len) {
         /* skip whitespace and newlines before every token */
         while ((*walk == ' ' || *walk == '\t' ||
                 *walk == '\r' || *walk == '\n') && *walk != '\0')

diff --git a/src/config.c b/src/config.c
index c030eb9a8ef93461bd5a73e90a3eaa2e1662e41d..4ce45ad6f496acbdf2f0ffc21ae9ee291ff0e4a5 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -175,7 +175,7 @@ void grab_all_keys(xcb_connection_t *conn, bool bind_mode_switch) {
         }
 
         xcb_keycode_t *walk = bind->translated_to;
-        for (int i = 0; i < bind->number_keycodes; i++)
+        for (uint32_t i = 0; i < bind->number_keycodes; i++)
             grab_keycode_for_binding(conn, bind, *walk++);
     }
 }

diff --git a/src/config_parser.c b/src/config_parser.c
index bbd59a4572b08c47eedd6245e637708e9542ce7d..cb21dae7c9c058ad601eaf445470c1f67223a0ec 100644 (file)
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -159,7 +159,7 @@ static const char *get_string(const char *identifier) {
     return NULL;
 }
 
-static const long get_long(const char *identifier) {
+static long get_long(const char *identifier) {
     for (int c = 0; c < 10; c++) {
         if (stack[c].identifier == NULL)
             break;
@@ -346,7 +346,7 @@ struct ConfigResult *parse_config(const char *input, struct context *context) {
 
     /* The "<=" operator is intentional: We also handle the terminating 0-byte
      * explicitly by looking for an 'end' token. */
-    while ((walk - input) <= len) {
+    while ((size_t)(walk - input) <= len) {
         /* Skip whitespace before every token, newlines are relevant since they
          * separate configuration directives. */
         while ((*walk == ' ' || *walk == '\t') && *walk != '\0')
@@ -585,7 +585,7 @@ struct ConfigResult *parse_config(const char *input, struct context *context) {
             y(map_close);
 
             /* Skip the rest of this line, but continue parsing. */
-            while ((walk - input) <= len && *walk != '\n')
+            while ((size_t)(walk - input) <= len && *walk != '\n')
                 walk++;
 
             free(position);

diff --git a/src/display_version.c b/src/display_version.c
index 427c4ff7d69a52139cd755fbd1355290bd26d5c8..73bc54d11084c74c8fad8f8380b3f74d86e44ec7 100644 (file)
--- a/src/display_version.c
+++ b/src/display_version.c
@@ -135,7 +135,7 @@ void display_running_version(void) {
 
     sasprintf(&exepath, "/proc/%d/exe", getpid());
 
-    while ((linksize = readlink(exepath, destpath, destpath_size)) == destpath_size) {
+    while ((linksize = readlink(exepath, destpath, destpath_size)) == (ssize_t)destpath_size) {
             destpath_size = destpath_size * 2;
             destpath = srealloc(destpath, destpath_size);
     }
@@ -151,7 +151,7 @@ void display_running_version(void) {
     free(exepath);
     sasprintf(&exepath, "/proc/%s/exe", pid_from_atom);
 
-    while ((linksize = readlink(exepath, destpath, destpath_size)) == destpath_size) {
+    while ((linksize = readlink(exepath, destpath, destpath_size)) == (ssize_t)destpath_size) {
         destpath_size = destpath_size * 2;
         destpath = srealloc(destpath, destpath_size);
     }

diff --git a/src/fake_outputs.c b/src/fake_outputs.c
index e115329952fc14f0a2860276d856b11a8f354ba9..acbc456d99bebe57d15f711d523ed7c43042b16f 100644 (file)
--- a/src/fake_outputs.c
+++ b/src/fake_outputs.c
@@ -18,7 +18,7 @@ static int num_screens;
  * Looks in outputs for the Output whose start coordinates are x, y
  *
  */
-static Output *get_screen_at(int x, int y) {
+static Output *get_screen_at(unsigned int x, unsigned int y) {
     Output *output;
     TAILQ_FOREACH(output, &outputs, outputs)
         if (output->rect.x == x && output->rect.y == y)

diff --git a/src/floating.c b/src/floating.c
index 166e054cf67f93942013a0c1f3f6092971db4129..1c35c8d0e854bb3364bd47e761dd26224b36e040 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -535,12 +535,12 @@ void floating_resize_window(Con *con, const bool proportional,
      * a bitmask of the nearest borders (BORDER_LEFT, BORDER_RIGHT, …) */
     border_t corner = 0;
 
-    if (event->event_x <= (con->rect.width / 2))
+    if (event->event_x <= (int16_t)(con->rect.width / 2))
         corner |= BORDER_LEFT;
     else corner |= BORDER_RIGHT;
 
     int cursor = 0;
-    if (event->event_y <= (con->rect.height / 2)) {
+    if (event->event_y <= (int16_t)(con->rect.height / 2)) {
         corner |= BORDER_TOP;
         cursor = (corner & BORDER_LEFT) ?
             XCURSOR_CURSOR_TOP_LEFT_CORNER : XCURSOR_CURSOR_TOP_RIGHT_CORNER;

diff --git a/src/handlers.c b/src/handlers.c
index fce6627659487199dfe66f1286c4e3da406d6686..312372a7f08bea0af817eb92d203b19efa130cea 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -1034,7 +1034,7 @@ static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom)
     struct property_handler_t *handler = NULL;
     xcb_get_property_reply_t *propr = NULL;
 
-    for (int c = 0; c < sizeof(property_handlers) / sizeof(struct property_handler_t); c++) {
+    for (size_t c = 0; c < sizeof(property_handlers) / sizeof(struct property_handler_t); c++) {
         if (property_handlers[c].atom != atom)
             continue;
 

diff --git a/src/log.c b/src/log.c
index 86f47b9acfa7c3c77362d587fce4cc73bfa8579b..5635278db6a67d1946fee808de647cd95417745a 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -250,7 +250,7 @@ static void vlog(const bool print, const char *fmt, va_list args) {
 
         /* If there is no space for the current message in the ringbuffer, we
          * need to wrap and write to the beginning again. */
-        if (len >= (logbuffer_size - (logwalk - logbuffer))) {
+        if (len >= (size_t)(logbuffer_size - (logwalk - logbuffer))) {
             loglastwrap = logwalk;
             logwalk = logbuffer + sizeof(i3_shmlog_header);
             store_log_markers();

diff --git a/src/manage.c b/src/manage.c
index d7a28eb140a83a612d7a29d98b6419b61a28c3db..8874994dfc04bde6cfdc6576ab3ebbc164ba9385 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -252,7 +252,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
             cwindow->dock = W_DOCK_BOTTOM;
         } else {
             DLOG("Ignoring invalid reserved edges (_NET_WM_STRUT_PARTIAL), using position as fallback:\n");
-            if (geom->y < (search_at->rect.height / 2)) {
+            if (geom->y < (int16_t)(search_at->rect.height / 2)) {
                 DLOG("geom->y = %d < rect.height / 2 = %d, it is a top dock client\n",
                      geom->y, (search_at->rect.height / 2));
                 cwindow->dock = W_DOCK_TOP;

diff --git a/src/randr.c b/src/randr.c
index 1aef9c9c620c59af800c4a1e972f6dd6cbb0aecb..53a9a1777d8f45d391187e19c0668c16bb24e058 100644 (file)
--- a/src/randr.c
+++ b/src/randr.c
@@ -77,7 +77,7 @@ Output *get_first_output(void) {
  * if there is no output which contains these coordinates.
  *
  */
-Output *get_output_containing(int x, int y) {
+Output *get_output_containing(unsigned int x, unsigned int y) {
     Output *output;
     TAILQ_FOREACH(output, &outputs, outputs) {
         if (!output->active)

diff --git a/src/util.c b/src/util.c
index e2df3ca9c0c9456f606d237bd90ce18d7a744793..877017578074b08ceab583fd092559480a817fb1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -224,7 +224,7 @@ char *store_restart_layout(void) {
         return NULL;
     }
 
-    int written = 0;
+    size_t written = 0;
     while (written < length) {
         int n = write(fd, payload + written, length - written);
         /* TODO: correct error-handling */
@@ -242,9 +242,9 @@ char *store_restart_layout(void) {
         }
         written += n;
 #if YAJL_MAJOR >= 2
-        printf("written: %d of %zd\n", written, length);
+        DLOG("written: %zd of %zd\n", written, length);
 #else
-        printf("written: %d of %d\n", written, length);
+        DLOG("written: %d of %d\n", written, length);
 #endif
     }
     close(fd);

diff --git a/src/window.c b/src/window.c
index b51be53f9f4e86db4f99692e8a75f6072a5884e6..219e64ce78639532d4b55869cce098fbdf11d0e5 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -32,7 +32,7 @@ void window_update_class(i3Window *win, xcb_get_property_reply_t *prop, bool bef
     FREE(win->class_class);
 
     win->class_instance = sstrdup(new_class);
-    if ((strlen(new_class) + 1) < xcb_get_property_value_length(prop))
+    if ((strlen(new_class) + 1) < (size_t)xcb_get_property_value_length(prop))
         win->class_class = sstrdup(new_class + strlen(new_class) + 1);
     else win->class_class = NULL;
     LOG("WM_CLASS changed to %s (instance), %s (class)\n",

diff --git a/src/xinerama.c b/src/xinerama.c
index 7e5b5aebb4acb60e64379ceed47ed17c0428f42e..b3e51ac535ae8f628f8e52d3bd33a9c35115b5e9 100644 (file)
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -22,7 +22,7 @@ static int num_screens;
  * Looks in outputs for the Output whose start coordinates are x, y
  *
  */
-static Output *get_screen_at(int x, int y) {
+static Output *get_screen_at(unsigned int x, unsigned int y) {
     Output *output;
     TAILQ_FOREACH(output, &outputs, outputs)
         if (output->rect.x == x && output->rect.y == y)