Make sure the arguments passed to printf/die(...) match the format

Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>

diff --git a/i3status.c b/i3status.c
index 6461d6b3ca7b271cde153b57d2485126c4d22ccf..316159c26440c182aec3fd270f4d0e31d901eb65 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -106,7 +106,7 @@ static bool path_exists(const char *path) {
 
 static void *scalloc(size_t size) {
     void *result = calloc(size, 1);
-    exit_if_null(result, "Error: out of memory (calloc(%zd))\n", size);
+    exit_if_null(result, "Error: out of memory (calloc(%zu))\n", size);
     return result;
 }
 
@@ -142,7 +142,7 @@ static int parse_min_width(cfg_t *context, cfg_opt_t *option, const char *value,
     long num = strtol(value, &end, 10);
 
     if (num < 0)
-        die("Invalid min_width attribute found in section %s, line %d: %d\n"
+        die("Invalid min_width attribute found in section %s, line %d: %ld\n"
             "Expected positive integer or string\n",
             context->name, context->line, num);
     else if (num == LONG_MIN || num == LONG_MAX || (end && *end != '\0'))

diff --git a/include/i3status.h b/include/i3status.h
index fe9206ea1c19c2b4650015cd5030371896d41b27..7bedfeddc225924f4d6f1d6eee99cdffa6db5c1a 100644 (file)
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -186,7 +186,8 @@ char *sstrdup(const char *str);
 
 /* src/general.c */
 char *skip_character(char *input, char character, int amount);
-void die(const char *fmt, ...);
+
+void die(const char *fmt, ...) __attribute__((format(printf, 1, 2), noreturn));
 bool slurp(const char *filename, char *destination, int size);
 
 /* src/output.c */

diff --git a/src/print_volume.c b/src/print_volume.c
index be6a1d7be2613a5463d85107a2c0d337482903b0..e28a132fdb3ba5ad76710f6c4c342315c19aa4ae 100644 (file)
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -151,7 +151,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
     snd_mixer_selem_id_set_index(sid, mixer_idx);
     snd_mixer_selem_id_set_name(sid, mixer);
     if (!(elem = snd_mixer_find_selem(m, sid))) {
-        fprintf(stderr, "i3status: ALSA: Cannot find mixer %s (index %i)\n",
+        fprintf(stderr, "i3status: ALSA: Cannot find mixer %s (index %u)\n",
                 snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid));
         snd_mixer_close(m);
         snd_mixer_selem_id_free(sid);