Clean up UNUSED warnings and others

diff --git a/src/debug.cc b/src/debug.cc
index d315b2a..ef66ffe 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -345,7 +345,7 @@ void log_print_backtrace(const gchar *file, const gchar *function, gint line)
                }
 }
 #else
-void log_print_backtrace(const gchar *file, const gchar *function, gint line)
+void log_print_backtrace(const gchar *UNUSED(file), const gchar *UNUSED(function), gint UNUSED(line))
 {
 }
 #endif

diff --git a/src/exif-int.h b/src/exif-int.h
index bd0b114..8c6ff72 100644 (file)
--- a/src/exif-int.h
+++ b/src/exif-int.h
@@ -70,8 +70,8 @@ struct ExifMarker
        guint           tag;
        ExifFormatType  format;
        gint            components;
-       gchar           *key;
-       gchar           *description;
+       const gchar             *key;
+       const gchar             *description;
        ExifTextList    *list;
 };
 

diff --git a/src/exif.cc b/src/exif.cc
index e467c72..47f719e 100644 (file)
--- a/src/exif.cc
+++ b/src/exif.cc
@@ -1443,8 +1443,8 @@ static gchar *exif_item_get_data_as_text_full(ExifItem *item, MetadataFormat for
                g_string_append(string, " ...");
                }
 
-       text = string->str;
-       g_string_free(string, FALSE);
+       text = g_strdup(string->str);
+       g_string_free(string, TRUE);
 
        return text;
 }
@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
        return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
 }
 
-gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *UNUSED(exif))
 {
        return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
 }