summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@chaosdorf.de>2017-09-26 21:51:18 +0200
committerGitHub <noreply@github.com>2017-09-26 21:51:18 +0200
commitfaf94a3aa5310e7ed461c9fe60f6f3b834c986e5 (patch)
tree10c81c14bf0cebd5607b48d841d98bf0900612ff /src
parent1ed8c69012eb238082dc4bb6befa10fc7b9426fa (diff)
parentf49f0879e651d8c92468f232febe143db2cbcd36 (diff)
Merge pull request #331 from zeising/zeising-silence-warnings
silence comple warnings and fix previous dead code
Diffstat (limited to 'src')
-rw-r--r--src/imlib.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/imlib.c b/src/imlib.c
index 71b0a81..dfb79aa 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -207,10 +207,6 @@ int feh_load_image(Imlib_Image * im, feh_file * file)
char *tmpname = NULL;
char *real_filename = NULL;
-#ifdef HAVE_LIBEXIF
- ExifEntry *entry;
-#endif
-
D(("filename is %s, image is %p\n", file->filename, im));
if (!file || !file->filename)
@@ -683,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
{