diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 6d8aa96104..f62c1afae8 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -575,7 +575,8 @@ nm_auth_manager_setup (gboolean polkit_enabled) singleton_instance = self; nm_singleton_instance_register (); - nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMAuthManager", singleton_instance); + nm_log_dbg (LOGD_CORE, "setup %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", + "NMAuthManager", NM_HASH_OBFUSCATE_PTR (singleton_instance)); return self; } diff --git a/src/nm-config.c b/src/nm-config.c index 3e82bdec05..9fcd6591d5 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -2709,7 +2709,8 @@ nm_config_setup (const NMConfigCmdLineOptions *cli, char **atomic_section_prefix /* usually, you would not see this logging line because when creating the * NMConfig instance, the logging is not yet set up to print debug message. */ - nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMConfig", singleton_instance); + nm_log_dbg (LOGD_CORE, "setup %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", + "NMConfig", NM_HASH_OBFUSCATE_PTR (singleton_instance)); } return singleton_instance; } diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index b0cc914e77..02ce8c81c9 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -142,8 +142,10 @@ _nm_singleton_instance_destroy (void) g_object_weak_unref (instance, _nm_singleton_instance_weak_cb, NULL); - if (instance->ref_count > 1) - nm_log_dbg (LOGD_CORE, "disown %s singleton (%p)", G_OBJECT_TYPE_NAME (instance), instance); + if (instance->ref_count > 1) { + nm_log_dbg (LOGD_CORE, "disown %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", + G_OBJECT_TYPE_NAME (instance), NM_HASH_OBFUSCATE_PTR (instance)); + } g_object_unref (instance); } diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 1f9996ca80..17af1f51eb 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -42,7 +42,9 @@ static void \ _singleton_instance_weak_ref_cb (gpointer data, \ GObject *where_the_object_was) \ { \ - nm_log_dbg (LOGD_CORE, "disposing %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \ + nm_log_dbg (LOGD_CORE, "disposing %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", \ + G_STRINGIFY (TYPE), \ + NM_HASH_OBFUSCATE_PTR (singleton_instance)); \ singleton_instance = NULL; \ } \ static inline void \ @@ -73,7 +75,9 @@ GETTER (void) \ singleton_instance = (g_object_new (GTYPE, ##__VA_ARGS__, NULL)); \ g_assert (singleton_instance); \ nm_singleton_instance_register (); \ - nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \ + nm_log_dbg (LOGD_CORE, "create %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", \ + G_STRINGIFY (TYPE), \ + NM_HASH_OBFUSCATE_PTR (singleton_instance)); \ } \ return singleton_instance; \ } \ diff --git a/src/nm-manager.c b/src/nm-manager.c index 90bc69bfbb..33d847e66c 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -7272,7 +7272,8 @@ nm_manager_setup (void) singleton_instance = self; nm_singleton_instance_register (); - _LOGD (LOGD_CORE, "setup %s singleton (%p)", "NMManager", singleton_instance); + nm_log_dbg (LOGD_CORE, "setup %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", + "NMManager", NM_HASH_OBFUSCATE_PTR (singleton_instance)); nm_dbus_object_export (NM_DBUS_OBJECT (self)); return self; diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 7add7dcdbe..a2d4116de1 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -221,7 +221,8 @@ nm_platform_setup (NMPlatform *instance) nm_singleton_instance_register (); - nm_log_dbg (LOGD_CORE, "setup %s singleton (%p, %s)", "NMPlatform", singleton_instance, G_OBJECT_TYPE_NAME (instance)); + nm_log_dbg (LOGD_CORE, "setup %s singleton ("NM_HASH_OBFUSCATE_PTR_FMT")", + "NMPlatform", NM_HASH_OBFUSCATE_PTR (instance)); } /**