Add missing #ifdef for DEBUG_FD

[geeqie.git] / src / filedata.cc

diff --git a/src/filedata.cc b/src/filedata.cc
index c7d178f..065f870 100644 (file)
--- a/src/filedata.cc
+++ b/src/filedata.cc
@@ -196,7 +196,7 @@ static gboolean file_data_check_changed_files_recursive(FileData *fd, struct sta
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                struct stat st;
                work = work->next;
 
@@ -244,7 +244,7 @@ gboolean file_data_check_changed_files(FileData *fd)
                work = sidecars;
                while (work)
                        {
-                       sfd = work->data;
+                       sfd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        file_data_disconnect_sidecar_file(fd, sfd);
@@ -376,7 +376,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
        if (!file_data_pool)
                file_data_pool = g_hash_table_new(g_str_hash, g_str_equal);
 
-       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, path_utf8));
        if (fd)
                {
                file_data_ref(fd);
@@ -384,7 +384,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
 
        if (!fd && file_data_planned_change_hash)
                {
-               fd = g_hash_table_lookup(file_data_planned_change_hash, path_utf8);
+               fd = static_cast<FileData *>(g_hash_table_lookup(file_data_planned_change_hash, path_utf8));
                if (fd)
                        {
                        DEBUG_1("planned change: using %s -> %s", path_utf8, fd->path);
@@ -481,7 +481,7 @@ FileData *file_data_new_simple(const gchar *path_utf8)
                st.st_mtime = 0;
                }
 
-       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, path_utf8));
        if (!fd) fd = file_data_new(path_utf8, &st, TRUE);
        if (fd)
                {
@@ -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;
 
@@ -709,13 +710,14 @@ void file_data_dump()
 
                while (list)
                        {
-                       fd = list->data;
+                       fd = static_cast<FileData *>(list->data);
                        log_printf("%-4d %s", fd->ref, fd->path);
                        list = list->next;
                        }
 
                g_list_free(list);
                }
+#endif
 }
 
 static void file_data_free(FileData *fd)
@@ -777,7 +779,7 @@ static void file_data_consider_free(FileData *fd)
        work = parent->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                if (file_data_check_has_ref(sfd)) return;
                work = work->next;
                }
@@ -789,7 +791,7 @@ static void file_data_consider_free(FileData *fd)
        work = parent->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                file_data_free(sfd);
                work = work->next;
                }
@@ -880,7 +882,7 @@ void file_data_lock_list(GList *list)
        work = list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                file_data_lock(fd);
                }
@@ -898,7 +900,7 @@ void file_data_unlock_list(GList *list)
        work = list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                file_data_unlock(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;
@@ -933,7 +935,7 @@ static gint sidecar_file_priority(const gchar *extension)
        work = sidecar_ext_get_list();
 
        while (work) {
-               gchar *ext = work->data;
+               gchar *ext = static_cast<gchar *>(work->data);
 
                work = work->next;
                if (g_ascii_strcasecmp(extension, ext) == 0) return i;
@@ -958,7 +960,7 @@ static void file_data_check_sidecars(const GList *basename_list)
        work = basename_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                g_assert(fd->magick == FD_MAGICK);
                DEBUG_2("basename: %p %s", (void *)fd, fd->name);
@@ -970,7 +972,7 @@ static void file_data_check_sidecars(const GList *basename_list)
                s_work = fd->sidecar_files;
                while (s_work)
                        {
-                       FileData *sfd = s_work->data;
+                       FileData *sfd = static_cast<FileData *>(s_work->data);
                        s_work = s_work->next;
                        g_assert(sfd->magick == FD_MAGICK);
                        DEBUG_2("                  sidecar: %p %s", (void *)sfd, sfd->name);
@@ -979,7 +981,7 @@ static void file_data_check_sidecars(const GList *basename_list)
                g_assert(fd->parent == NULL || fd->sidecar_files == NULL);
                }
 
-       parent_fd = basename_list->data;
+       parent_fd = static_cast<FileData *>(basename_list->data);
 
        /* check if the second and next entries of basename_list are already connected
           as sidecars of the first entry (parent_fd) */
@@ -1006,7 +1008,7 @@ static void file_data_check_sidecars(const GList *basename_list)
        work = basename_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                g_assert(fd->parent == NULL || fd->sidecar_files == NULL);
 
@@ -1022,7 +1024,7 @@ static void file_data_check_sidecars(const GList *basename_list)
 
                while (fd->sidecar_files)
                        {
-                       FileData *sfd = fd->sidecar_files->data;
+                       FileData *sfd = static_cast<FileData *>(fd->sidecar_files->data);
                        g_assert(sfd->parent == NULL || sfd->sidecar_files == NULL);
                        file_data_ref(sfd);
                        file_data_disconnect_sidecar_file(fd, sfd);
@@ -1039,7 +1041,7 @@ static void file_data_check_sidecars(const GList *basename_list)
        new_sidecars = NULL;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                g_assert(sfd->magick == FD_MAGICK);
                g_assert(sfd->parent == NULL && sfd->sidecar_files == NULL);
                sfd->parent = parent_fd;
@@ -1096,7 +1098,7 @@ void file_data_disable_grouping(FileData *fd, gboolean disable)
                        GList *work = sidecar_files;
                        while (work)
                                {
-                               FileData *sfd = work->data;
+                               FileData *sfd = static_cast<FileData *>(work->data);
                                work = work->next;
                                file_data_disconnect_sidecar_file(fd, sfd);
                                file_data_send_notification(sfd, NOTIFY_GROUPING);
@@ -1124,7 +1126,7 @@ void file_data_disable_grouping_list(GList *fd_list, gboolean disable)
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_disable_grouping(fd, disable);
                work = work->next;
@@ -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)
@@ -1259,7 +1261,7 @@ static GList * file_data_basename_hash_insert(GHashTable *basename_hash, FileDat
        GList *list;
        gchar *basename = g_strndup(fd->path, fd->extension - fd->path);
 
-       list = g_hash_table_lookup(basename_hash, basename);
+       list = static_cast<GList *>(g_hash_table_lookup(basename_hash, basename));
 
        if (!list)
                {
@@ -1271,11 +1273,11 @@ static GList * file_data_basename_hash_insert(GHashTable *basename_hash, FileDat
                        DEBUG_1("TG: parent extension %s",parent_extension);
                        gchar *parent_basename = g_strndup(basename, parent_extension - basename);
                        DEBUG_1("TG: parent basename %s",parent_basename);
-                       FileData *parent_fd = g_hash_table_lookup(file_data_pool, basename);
+                       FileData *parent_fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, basename));
                        if (parent_fd)
                                {
                                DEBUG_1("TG: parent fd found");
-                               list = g_hash_table_lookup(basename_hash, parent_basename);
+                               list = static_cast<GList *>(g_hash_table_lookup(basename_hash, parent_basename));
                                if (!g_list_find(list, parent_fd))
                                        {
                                        DEBUG_1("TG: parent fd doesn't fit");
@@ -1333,7 +1335,7 @@ static GList *filelist_filter_out_sidecars(GList *flist)
 
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                work = work->next;
                if (fd->parent) /* remove fd's that are children */
@@ -1507,7 +1509,7 @@ FileData *file_data_new_group(const gchar *path_utf8)
 
        filelist_read_real(dir, &files, NULL, TRUE);
 
-       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, path_utf8));
        if (!fd) fd = file_data_new(path_utf8, &st, TRUE);
        if (fd)
                {
@@ -1545,7 +1547,7 @@ GList *filelist_copy(GList *list)
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, file_data_ref(fd));
@@ -1564,7 +1566,7 @@ GList *filelist_from_path_list(GList *list)
                {
                gchar *path;
 
-               path = work->data;
+               path = static_cast<gchar *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, file_data_new_group(path));
@@ -1583,7 +1585,7 @@ GList *filelist_to_path_list(GList *list)
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, g_strdup(fd->path));
@@ -1768,7 +1770,7 @@ gchar *file_data_get_sidecar_path(FileData *fd, gboolean existing_only)
        gchar *extended_extension = g_strconcat(fd->parent ? fd->parent->extension : fd->extension, ".xmp", NULL);
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                work = work->next;
                if (g_ascii_strcasecmp(sfd->extension, ".xmp") == 0 || g_ascii_strcasecmp(sfd->extension, extended_extension) == 0)
                        {
@@ -1878,7 +1880,7 @@ GList *file_data_filter_marks_list(GList *list, guint filter)
        work = list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                GList *link = work;
                work = work->next;
 
@@ -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)
@@ -1905,7 +1907,7 @@ GList *file_data_filter_file_filter_list(GList *list, GRegex *filter)
        work = list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                GList *link = work;
                work = work->next;
 
@@ -1945,7 +1947,7 @@ GList *file_data_filter_class_list(GList *list, guint filter)
        work = list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                GList *link = work;
                work = work->next;
 
@@ -1962,7 +1964,7 @@ GList *file_data_filter_class_list(GList *list, guint filter)
 
 static void file_data_notify_mark_func(gpointer UNUSED(key), gpointer value, gpointer UNUSED(user_data))
 {
-       FileData *fd = value;
+       FileData *fd = static_cast<FileData *>(value);
        file_data_increment_version(fd);
        file_data_send_notification(fd, NOTIFY_MARKS);
 }
@@ -2024,7 +2026,7 @@ gchar *file_data_sc_list_to_string(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                result = g_string_append(result, "+ ");
                result = g_string_append(result, sfd->extension);
@@ -2139,7 +2141,7 @@ static gboolean file_data_sc_add_ci(FileData *fd, FileDataChangeType type)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                if (sfd->change) return FALSE;
                work = work->next;
@@ -2150,7 +2152,7 @@ static gboolean file_data_sc_add_ci(FileData *fd, FileDataChangeType type)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_add_ci(sfd, type, NULL, NULL);
                work = work->next;
@@ -2170,7 +2172,7 @@ static gboolean file_data_sc_check_ci(FileData *fd, FileDataChangeType type)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                if (!sfd->change || sfd->change->type != type) return FALSE;
                work = work->next;
@@ -2229,7 +2231,7 @@ void file_data_sc_free_ci(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_free_ci(sfd);
                work = work->next;
@@ -2244,7 +2246,7 @@ gboolean file_data_sc_add_ci_delete_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!file_data_sc_add_ci_delete(fd)) ret = FALSE;
                work = work->next;
@@ -2260,7 +2262,7 @@ static void file_data_sc_revert_ci_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_sc_free_ci(fd);
                work = work->prev;
@@ -2274,7 +2276,7 @@ static gboolean file_data_sc_add_ci_list_call_func(GList *fd_list, const gchar *
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!func(fd, dest))
                        {
@@ -2315,7 +2317,7 @@ gboolean file_data_add_ci_write_metadata_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!file_data_add_ci_write_metadata(fd)) ret = FALSE;
                work = work->next;
@@ -2331,7 +2333,7 @@ void file_data_free_ci_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_free_ci(fd);
                work = work->next;
@@ -2345,7 +2347,7 @@ void file_data_sc_free_ci_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_sc_free_ci(fd);
                work = work->next;
@@ -2375,7 +2377,7 @@ static void file_data_update_planned_change_hash(FileData *fd, const gchar *old_
                        file_data_unref(fd);
                        }
 
-               ofd = g_hash_table_lookup(file_data_planned_change_hash, new_path);
+               ofd = static_cast<FileData *>(g_hash_table_lookup(file_data_planned_change_hash, new_path));
                if (ofd != fd)
                        {
                        if (ofd)
@@ -2444,7 +2446,7 @@ static void file_data_sc_update_ci(FileData *fd, const gchar *dest_path)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_update_ci_dest_preserve_ext(sfd, dest_path);
                work = work->next;
@@ -2490,7 +2492,7 @@ static gboolean file_data_sc_update_ci_list_call_func(GList *fd_list,
        work = fd_list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!func(fd, dest)) ret = FALSE;
                work = work->next;
@@ -2747,7 +2749,7 @@ gint file_data_verify_ci(FileData *fd, GList *list)
                work = list;
                while (work)
                        {
-                       fd1 = work->data;
+                       fd1 = static_cast<FileData *>(work->data);
                        work = work->next;
                        if (fd1 != NULL && fd != fd1 )
                                {
@@ -2777,7 +2779,7 @@ gint file_data_sc_verify_ci(FileData *fd, GList *list)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                ret |= file_data_verify_ci(sfd, list);
                work = work->next;
@@ -2891,7 +2893,7 @@ gint file_data_verify_ci_list(GList *list, gchar **desc, gboolean with_sidecars)
                FileData *fd;
                gint error;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                error = with_sidecars ? file_data_sc_verify_ci(fd, list) : file_data_verify_ci(fd, list);
@@ -2923,7 +2925,7 @@ gint file_data_verify_ci_list(GList *list, gchar **desc, gboolean with_sidecars)
                        FileData *fd;
                        gint error;
 
-                       fd = work->data;
+                       fd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        error = errors[i] & ~common_errors;
@@ -3010,7 +3012,7 @@ gboolean file_data_sc_perform_ci(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                if (!file_data_perform_ci(sfd)) ret = FALSE;
                work = work->next;
@@ -3066,7 +3068,7 @@ gboolean file_data_sc_apply_ci(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_apply_ci(sfd);
                work = work->next;
@@ -3102,7 +3104,7 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis
                {
                while (work)
                        {
-                       FileData *fd = work->data;
+                       FileData *fd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        if (!file_data_list_contains_whole_group(list, fd))
@@ -3121,7 +3123,7 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis
        work = list;
        while (work)
                {
-               FileData *fd = work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!fd->parent ||
@@ -3270,7 +3272,7 @@ static guint realtime_monitor_id = 0; /* event source id */
 
 static void realtime_monitor_check_cb(gpointer key, gpointer UNUSED(value), gpointer UNUSED(data))
 {
-       FileData *fd = key;
+       FileData *fd = static_cast<FileData *>(key);
 
        file_data_check_changed_files(fd);
 
@@ -3348,13 +3350,13 @@ gboolean file_data_unregister_real_time_monitor(FileData *fd)
 
 static void marks_get_files(gpointer key, gpointer value, gpointer userdata)
 {
-       gchar *file_name = key;
-       GString *result = userdata;
+       gchar *file_name = static_cast<gchar *>(key);
+       GString *result = static_cast<GString *>(userdata);
        FileData *fd;
 
        if (isfile(file_name))
                {
-               fd = value;
+               fd = static_cast<FileData *>(value);
                if (fd && fd->marks > 0)
                        {
                        g_string_append_printf(result, "%s,%i\n", fd->path, fd->marks);
@@ -3439,14 +3441,14 @@ gboolean marks_list_save(gchar *path, gboolean save)
 
 static void marks_clear(gpointer key, gpointer value, gpointer UNUSED(userdata))
 {
-       gchar *file_name = key;
+       gchar *file_name = static_cast<gchar *>(key);
        gint mark_no;
        gint n;
        FileData *fd;
 
        if (isfile(file_name))
                {
-               fd = value;
+               fd = static_cast<FileData *>(value);
                if (fd && fd->marks > 0)
                        {
                        n = 0;