marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
This commit is contained in:
Olivier Gayot 2018-06-12 09:41:44 +02:00
parent ca8c3e7337
commit 598b76cc53
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3status.c
View File

@ -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'))

3
include/i3status.h
View File

@ -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 */

2
src/print_volume.c
View File

@ -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);