fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-21 13:00:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

setting: prettify logging hostname changes

Browse source 
Also, avoid passing NULL for "%s" format. While glibc is fine with
it, don't rely on that.

Fixes: 6dc35e66d4
This commit is contained in:
Thomas Haller 2015-06-26 17:14:07 +02:00
parent 7364d7f8f2
commit 86520f5f60
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/settings/nm-settings.c
View file

@ -1730,8 +1730,9 @@ hostname_maybe_changed (NMSettings *settings)
|| (!new_hostname && priv->hostname.value)
|| (priv->hostname.value && new_hostname && strcmp (priv->hostname.value, new_hostname))) {
nm_log_info (LOGD_SETTINGS, "hostname changed from '%s' to '%s'",
priv->hostname.value, new_hostname);
nm_log_info (LOGD_SETTINGS, "hostname changed from %s%s%s to %s%s%s",
NM_PRINT_FMT_QUOTED (priv->hostname.value, "\"", priv->hostname.value, "\"", "(none)"),
NM_PRINT_FMT_QUOTED (new_hostname, "\"", new_hostname, "\"", "(none)"));
g_free (priv->hostname.value);
priv->hostname.value = new_hostname;
g_object_notify (G_OBJECT (settings), NM_SETTINGS_HOSTNAME);
@ -2065,8 +2066,9 @@ hostnamed_properties_changed (GDBusProxy *proxy,
hostname = g_variant_get_string (v_hostname, NULL);
if (g_strcmp0 (priv->hostname.value, hostname) != 0) {
nm_log_info (LOGD_SETTINGS, "hostname changed from '%s' to '%s'",
priv->hostname.value, hostname);
nm_log_info (LOGD_SETTINGS, "hostname changed from %s%s%s to %s%s%s",
NM_PRINT_FMT_QUOTED (priv->hostname.value, "\"", priv->hostname.value, "\"", "(none)"),
NM_PRINT_FMT_QUOTED (hostname, "\"", hostname, "\"", "(none)"));
g_free (priv->hostname.value);
priv->hostname.value = g_strdup (hostname);
g_object_notify (G_OBJECT (user_data), NM_SETTINGS_HOSTNAME);