colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: refactor logging statement in nm_settings_connection_get_secrets()

Browse Source
This commit is contained in:
Thomas Haller
2015-07-03 11:30:26 +02:00
parent 5b123f2539
commit 0dcd7b2208
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings/nm-settings-connection.c
View File

@@ -38,6 +38,7 @@
#include "nm-properties-changed-signal.h" #include "nm-properties-changed-signal.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-glib-compat.h" #include "nm-glib-compat.h"
#include "gsystem-local-alloc.h"
#define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps" #define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps"
#define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids" #define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"
@@ -938,7 +939,7 @@ nm_settings_connection_get_secrets (NMSettingsConnection *self,
GVariant *existing_secrets; GVariant *existing_secrets;
GHashTable *existing_secrets_hash; GHashTable *existing_secrets_hash;
guint32 call_id = 0; guint32 call_id = 0;
char *joined_hints = NULL; gs_free char *joined_hints = NULL;
/* Use priv->secrets to work around the fact that nm_connection_clear_secrets() /* Use priv->secrets to work around the fact that nm_connection_clear_secrets()
* will clear secrets on this object's settings. * will clear secrets on this object's settings.
@@ -976,17 +977,12 @@ nm_settings_connection_get_secrets (NMSettingsConnection *self,
if (existing_secrets) if (existing_secrets)
g_variant_unref (existing_secrets); g_variant_unref (existing_secrets);
if (nm_logging_enabled (LOGL_DEBUG, LOGD_SETTINGS)) {
if (hints)
joined_hints = g_strjoinv (",", (char **) hints);
nm_log_dbg (LOGD_SETTINGS, "(%s/%s:%u) secrets requested flags 0x%X hints '%s'", nm_log_dbg (LOGD_SETTINGS, "(%s/%s:%u) secrets requested flags 0x%X hints '%s'",
nm_connection_get_uuid (NM_CONNECTION (self)), nm_connection_get_uuid (NM_CONNECTION (self)),
setting_name, setting_name,
call_id, call_id,
flags, flags,
joined_hints ? joined_hints : "(none)"); (hints && hints[0]) ? (joined_hints = g_strjoinv (",", (char **) hints)) : "(none)");
g_free (joined_hints);
}
return call_id; return call_id;
} }