Add missing #ifdef for DEBUG_FD

[geeqie.git] / src / filedata.cc

diff --git a/src/filedata.cc b/src/filedata.cc
index 84390e2..065f870 100644 (file)
--- a/src/filedata.cc
+++ b/src/filedata.cc
@@ -514,7 +514,7 @@ void read_exif_time_data(FileData *file)
                        struct tm time_str;
                        uint year, month, day, hour, min, sec;
 
-                       sscanf(tmp, "%4d:%2d:%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
+                       sscanf(tmp, "%4u:%2u:%2u %2u:%2u:%2u", &year, &month, &day, &hour, &min, &sec);
                        time_str.tm_year  = year - 1900;
                        time_str.tm_mon   = month - 1;
                        time_str.tm_mday  = day;
@@ -552,7 +552,7 @@ void read_exif_time_digitized_data(FileData *file)
                        struct tm time_str;
                        uint year, month, day, hour, min, sec;
 
-                       sscanf(tmp, "%4d:%2d:%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
+                       sscanf(tmp, "%4u:%2u:%2u %2u:%2u:%2u", &year, &month, &day, &hour, &min, &sec);
                        time_str.tm_year  = year - 1900;
                        time_str.tm_mon   = month - 1;
                        time_str.tm_mday  = day;
@@ -697,6 +697,7 @@ FileData *file_data_ref(FileData *fd)
  */
 void file_data_dump()
 {
+#ifdef DEBUG_FILEDATA
        FileData *fd;
        GList *list;
 
@@ -716,6 +717,7 @@ void file_data_dump()
 
                g_list_free(list);
                }
+#endif
 }
 
 static void file_data_free(FileData *fd)
@@ -912,8 +914,8 @@ void file_data_unlock_list(GList *list)
 
 static gint file_data_sort_by_ext(gconstpointer a, gconstpointer b)
 {
-       const FileData *fda = a;
-       const FileData *fdb = b;
+       const FileData *fda = static_cast<const FileData *>(a);
+       const FileData *fdb = static_cast<const FileData *>(b);
 
        if (fda->sidecar_priority < fdb->sidecar_priority) return -1;
        if (fda->sidecar_priority > fdb->sidecar_priority) return 1;
@@ -1215,7 +1217,7 @@ gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType me
 
 static gint filelist_sort_file_cb(gpointer a, gpointer b)
 {
-       return filelist_sort_compare_filedata(a, b);
+       return filelist_sort_compare_filedata(static_cast<FileData *>(a), static_cast<FileData *>(b));
 }
 
 GList *filelist_sort_full(GList *list, SortType method, gboolean ascend, GCompareFunc cb)
@@ -1895,7 +1897,7 @@ GList *file_data_filter_marks_list(GList *list, guint filter)
 
 gboolean file_data_filter_file_filter(FileData *fd, GRegex *filter)
 {
-       return g_regex_match(filter, fd->name, 0, NULL);
+       return g_regex_match(filter, fd->name, (GRegexMatchFlags)0, NULL);
 }
 
 GList *file_data_filter_file_filter_list(GList *list, GRegex *filter)