From 2c1fc2a84b7d7dcc731070f908b82da680972935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= Date: Sat, 25 Dec 2021 10:31:34 +0100 Subject: Debug: Convert dump functions to `GString, g_debug()` --- tumblerd/tumbler-manager.c | 23 +++++++++++++++-------- tumblerd/tumbler-registry.c | 17 ++++++++++++----- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c index 6f6c310..75557ff 100644 --- a/tumblerd/tumbler-manager.c +++ b/tumblerd/tumbler-manager.c @@ -1822,21 +1822,24 @@ dump_overrides (TumblerManager *manager) const gchar *hash_key; GList **list; GList *iter; + GString *string; if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) return; - g_print ("Overrides:\n"); + string = g_string_new ("Overrides:\n"); g_hash_table_iter_init (&table_iter, manager->overrides); while (g_hash_table_iter_next (&table_iter, (gpointer) &hash_key, (gpointer) &list)) { - g_print (" %s:\n", hash_key); + g_string_append_printf (string, " %s:\n", hash_key); for (iter = *list; iter != NULL; iter = iter->next) - g_print (" %s\n", ((OverrideInfo *)iter->data)->name); + g_string_append_printf (string, " %s\n", ((OverrideInfo *) iter->data)->name); } - g_print ("\n"); + g_string_truncate (string, string->len - 1); + g_debug ("%s", string->str); + g_string_free (string, TRUE); } @@ -1848,21 +1851,25 @@ dump_thumbnailers (TumblerManager *manager) const gchar *base_name; GList **list; GList *iter; + GString *string; if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) return; - g_print ("Thumbnailers:\n"); + string = g_string_new ("Thumbnailers:\n"); g_hash_table_iter_init (&table_iter, manager->thumbnailers); while (g_hash_table_iter_next (&table_iter, (gpointer) &base_name, (gpointer) &list)) { - g_print (" %s:\n", base_name); + g_string_append_printf (string, " %s:\n", base_name); for (iter = *list; iter != NULL; iter = iter->next) - g_print (" %s\n", g_file_peek_path (((ThumbnailerInfo *)iter->data)->file)); + g_string_append_printf (string, " %s\n", + g_file_peek_path (((ThumbnailerInfo *) iter->data)->file)); } - g_print ("\n"); + g_string_truncate (string, string->len - 1); + g_debug ("%s", string->str); + g_string_free (string, TRUE); } diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c index 6f5ad16..de48e16 100644 --- a/tumblerd/tumbler-registry.c +++ b/tumblerd/tumbler-registry.c @@ -128,14 +128,21 @@ tumbler_registry_finalize (GObject *object) static void dump_registry (TumblerRegistry *registry) { + GString *string; + if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) return; - g_print ("Registry:\n"); - g_print (" Preferred Thumbnailers: %d\n", - g_hash_table_size (registry->preferred_thumbnailers)); - g_print (" Registry Thumbnailers: %d\n",g_hash_table_size (registry->thumbnailers)); - g_print ("\n"); + string = g_string_new ("Registry:\n"); + + g_string_append_printf (string, " Preferred Thumbnailers: %d\n", + g_hash_table_size (registry->preferred_thumbnailers)); + g_string_append_printf (string, " Registry Thumbnailers: %d\n", + g_hash_table_size (registry->thumbnailers)); + + g_string_truncate (string, string->len - 1); + g_debug ("%s", string->str); + g_string_free (string, TRUE); } -- cgit v1.2.1