Fixed a couple of compiler warnings.

[platform/upstream/libexif.git] / libexif / exif-entry.c

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 34159c1..61260d3 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -570,7 +570,7 @@ exif_entry_format_value(ExifEntry *e, char *val, size_t maxlen)
                        v_srat = exif_get_srational (
                                e->data + 8 * i, o);
                        if (v_srat.denominator) {
-                               int decimals = (int)(log10(fabs(v_srat.denominator))-0.08+1.0);
+                               int decimals = (int)(log10(abs(v_srat.denominator))-0.08+1.0);
                                snprintf (val+len, maxlen-len, "%2.*f",
                                          decimals,
                                          (double) v_srat.numerator /
@@ -859,7 +859,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 
        (void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
-       if (!e || !e->parent || !e->parent->parent || !maxlen)
+       if (!e || !e->parent || !e->parent->parent || !maxlen || !val)
                return val;
 
        /* make sure the returned string is zero terminated */