diff options
author | Niclas Zeising <zeising@daemonic.se> | 2017-09-26 21:34:56 +0200 |
---|---|---|
committer | Niclas Zeising <zeising@daemonic.se> | 2017-09-26 21:42:30 +0200 |
commit | f49f0879e651d8c92468f232febe143db2cbcd36 (patch) | |
tree | 10c81c14bf0cebd5607b48d841d98bf0900612ff | |
parent | 9b4341e12c6be32b654478cdf3a4e8a631c4e31f (diff) |
Fix dead code
The check if buffer == NULL is always false, since buffer is an
autoamtic variable allocated when entering the function. What we
instead want to do is to check if the string is empty after the call to
exif_get_info(), since that means we could not read any exif
information.
When the code once more is enabled, I discovered that we need to copy
the information string into info_buf as well as into buffer, since it
is the former that is used to print the exif information on top of the
picture. Without this change, imlib warns about trying to write NULL
strings.
-rw-r--r-- | src/imlib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/imlib.c b/src/imlib.c index 290ec8f..dfb79aa 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -679,11 +679,12 @@ void feh_draw_exif(winwidget w) fn = feh_load_font(w); - if (buffer == NULL) + if (buffer[0] == '\0') { snprintf(buffer, EXIF_MAX_DATA, "%s", estrdup("Failed to run exif command")); - gib_imlib_get_text_size(fn, &buffer[0], NULL, &width, &height, IMLIB_TEXT_TO_RIGHT); - no_lines = 1; + gib_imlib_get_text_size(fn, buffer, NULL, &width, &height, IMLIB_TEXT_TO_RIGHT); + info_buf[no_lines] = estrdup(buffer); + no_lines++; } else { |