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

all: don't include error->code in log messages

Browse Source 
GError codes are only unique per domain, so logging the code without
also indicating the domain is not helpful. And anyway, if the error
messages are not distinctive enough to tell the whole story then we
should fix the error messages.

Based-on-patch-by: Dan Winship <danw@gnome.org>
This commit is contained in:
Thomas Haller
2016-02-28 18:12:28 +01:00
parent 6265398b6e
commit cd4f84b738
34 changed files with 95 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
callouts/nm-dispatcher.c
View File

@@ -549,8 +549,7 @@ script_dispatch (ScriptInfo *script)
request->num_scripts_nowait++; request->num_scripts_nowait++;
return TRUE; return TRUE;
} else { } else {
_LOG_S_W (script, "complete: failed to execute script: %s (%d)", _LOG_S_W (script, "complete: failed to execute script: %s", error->message);
error->message, error->code);
script->result = DISPATCH_RESULT_EXEC_FAILED; script->result = DISPATCH_RESULT_EXEC_FAILED;
script->error = g_strdup (error->message); script->error = g_strdup (error->message);
request->num_scripts_done++; request->num_scripts_done++;
@@ -594,8 +593,8 @@ find_scripts (const char *str_action)
dirname = NMD_SCRIPT_DIR_DEFAULT; dirname = NMD_SCRIPT_DIR_DEFAULT;
if (!(dir = g_dir_open (dirname, 0, &error))) { if (!(dir = g_dir_open (dirname, 0, &error))) {
g_message ("find-scripts: Failed to open dispatcher directory '%s': (%d) %s", g_message ("find-scripts: Failed to open dispatcher directory '%s': %s",
dirname, error->code, error->message); dirname, error->message);
g_error_free (error); g_error_free (error);
return NULL; return NULL;
} }

18
libnm-core/nm-setting-8021x.c
View File

@@ -2907,8 +2907,7 @@ set_property (GObject *object, guint prop_id,
g_bytes_unref (priv->ca_cert); g_bytes_unref (priv->ca_cert);
priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error); priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s", error->message);
error->code, error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2929,8 +2928,7 @@ set_property (GObject *object, guint prop_id,
g_bytes_unref (priv->client_cert); g_bytes_unref (priv->client_cert);
priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error); priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s", error->message);
error->code, error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2959,8 +2957,7 @@ set_property (GObject *object, guint prop_id,
g_bytes_unref (priv->phase2_ca_cert); g_bytes_unref (priv->phase2_ca_cert);
priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error); priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s", error->message);
error->code, error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2981,8 +2978,7 @@ set_property (GObject *object, guint prop_id,
g_bytes_unref (priv->phase2_client_cert); g_bytes_unref (priv->phase2_client_cert);
priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error); priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s", error->message);
error->code, error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -3006,8 +3002,7 @@ set_property (GObject *object, guint prop_id,
g_bytes_unref (priv->private_key); g_bytes_unref (priv->private_key);
priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error); priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error);
if (error) { if (error) {
g_warning ("Error setting private key (invalid data): (%d) %s", g_warning ("Error setting private key (invalid data): %s", error->message);
error->code, error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -3023,8 +3018,7 @@ set_property (GObject *object, guint prop_id,
g_bytes_unref (priv->phase2_private_key); g_bytes_unref (priv->phase2_private_key);
priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error); priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error);
if (error) { if (error) {
g_warning ("Error setting private key (invalid data): (%d) %s", g_warning ("Error setting private key (invalid data): %s", error->message);
error->code, error->message);
g_error_free (error); g_error_free (error);
} }
break; break;

4
libnm-glib/nm-active-connection.c
View File

@@ -139,8 +139,8 @@ _nm_active_connection_type_for_path (DBusGConnection *connection,
else else
type = NM_TYPE_ACTIVE_CONNECTION; type = NM_TYPE_ACTIVE_CONNECTION;
} else { } else {
g_warning ("Error in getting active connection 'Vpn' property: (%d) %s", g_warning ("Error in getting active connection 'Vpn' property: %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
type = G_TYPE_INVALID; type = G_TYPE_INVALID;
} }

6
libnm-glib/nm-client.c
View File

@@ -513,7 +513,7 @@ activate_info_complete (ActivateInfo *info,
error, error,
info->user_data); info->user_data);
} else if (error) } else if (error)
g_warning ("Device activation failed: (%d) %s", error->code, error->message); g_warning ("Device activation failed: %s", error->message);
priv->pending_activations = g_slist_remove (priv->pending_activations, info); priv->pending_activations = g_slist_remove (priv->pending_activations, info);
} }
@@ -1839,8 +1839,8 @@ constructed (GObject *object)
GError *error = NULL; GError *error = NULL;
if (!nm_utils_init (&error)) { if (!nm_utils_init (&error)) {
g_warning ("Couldn't initilize nm-utils/crypto system: %d %s", g_warning ("Couldn't initilize nm-utils/crypto system: %s",
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }

3
libnm-glib/nm-device.c
View File

@@ -2198,11 +2198,10 @@ device_operation_cb (DBusGProxy *proxy,
if (info->fn) if (info->fn)
info->fn (info->device, error, info->user_data); info->fn (info->device, error, info->user_data);
else if (error) { else if (error) {
g_warning ("%s: device %s %s failed: (%d) %s", g_warning ("%s: device %s %s failed: %s",
__func__, __func__,
nm_object_get_path (NM_OBJECT (info->device)), nm_object_get_path (NM_OBJECT (info->device)),
info->method, info->method,
error->code,
NM_G_ERROR_MSG (error)); NM_G_ERROR_MSG (error));
} }
g_clear_error (&error); g_clear_error (&error);

3
libnm-glib/nm-object.c
View File

@@ -1402,11 +1402,10 @@ _nm_object_reload_property (NMObject *object,
G_TYPE_INVALID, G_TYPE_INVALID,
G_TYPE_VALUE, &value, G_TYPE_VALUE, &value,
G_TYPE_INVALID)) { G_TYPE_INVALID)) {
dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n", dbgmsg ("%s: Error getting '%s' for %s: %s\n",
__func__, __func__,
prop_name, prop_name,
nm_object_get_path (object), nm_object_get_path (object),
err->code,
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return; return;

4
libnm-glib/nm-remote-connection.c
View File

@@ -454,10 +454,10 @@ replace_settings (NMRemoteConnection *self, GHashTable *new_settings)
if (nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error)) if (nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error))
g_signal_emit (self, signals[UPDATED], 0, new_settings); g_signal_emit (self, signals[UPDATED], 0, new_settings);
else { else {
g_warning ("%s: error updating connection %s settings: (%d) %s", g_warning ("%s: error updating connection %s settings: %s",
__func__, __func__,
nm_connection_get_path (NM_CONNECTION (self)), nm_connection_get_path (NM_CONNECTION (self)),
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
g_signal_emit (self, signals[REMOVED], 0); g_signal_emit (self, signals[REMOVED], 0);

3
libnm-glib/nm-remote-settings.c
View File

@@ -574,9 +574,8 @@ fetch_connections_done (DBusGProxy *proxy,
if ( !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN) if ( !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN)
&& !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NAME_HAS_NO_OWNER) && !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NAME_HAS_NO_OWNER)
&& priv->service_running) { && priv->service_running) {
g_warning ("%s: error fetching connections: (%d) %s.", g_warning ("%s: error fetching connections: %s.",
__func__, __func__,
error->code,
error->message ? error->message : "(unknown)"); error->message ? error->message : "(unknown)");
} }
g_clear_error (&error); g_clear_error (&error);

4
libnm-glib/nm-secret-agent.c
View File

@@ -330,8 +330,8 @@ verify_request (NMSecretAgent *self,
g_set_error (error, g_set_error (error,
NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
"Invalid connection: (%d) %s", "Invalid connection: %s",
local->code, local->message); local->message);
g_clear_error (&local); g_clear_error (&local);
} }

11
libnm-glib/nm-vpn-plugin.c
View File

@@ -455,8 +455,7 @@ _connect_generic (NMVPNPlugin *plugin,
connection = nm_connection_new_from_hash (properties, &local); connection = nm_connection_new_from_hash (properties, &local);
if (!connection) { if (!connection) {
g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: (%d) %s", "Invalid connection: %s", local->message);
local->code, local->message);
g_clear_error (&local); g_clear_error (&local);
return FALSE; return FALSE;
} }
@@ -537,9 +536,9 @@ impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin,
g_set_error (err, g_set_error (err,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
"The connection was invalid: '%s' / '%s' invalid: %d.", "The connection was invalid: '%s' / '%s' invalid.",
g_type_name (nm_connection_lookup_setting_type_by_quark (cnfh_err->domain)), g_type_name (nm_connection_lookup_setting_type_by_quark (cnfh_err->domain)),
cnfh_err->message, cnfh_err->code); cnfh_err->message);
g_error_free (cnfh_err); g_error_free (cnfh_err);
return FALSE; return FALSE;
} }
@@ -595,8 +594,8 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin,
connection = nm_connection_new_from_hash (properties, &local); connection = nm_connection_new_from_hash (properties, &local);
if (!connection) { if (!connection) {
g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: (%d) %s", "Invalid connection: %s",
local->code, local->message); local->message);
g_clear_error (&local); g_clear_error (&local);
return FALSE; return FALSE;
} }

28
libnm-util/nm-setting-8021x.c
View File

@@ -2878,8 +2878,8 @@ set_property (GObject *object, guint prop_id,
} }
priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error); priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2902,8 +2902,8 @@ set_property (GObject *object, guint prop_id,
} }
priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error); priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2934,8 +2934,8 @@ set_property (GObject *object, guint prop_id,
} }
priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error); priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2958,8 +2958,8 @@ set_property (GObject *object, guint prop_id,
} }
priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error); priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error);
if (error) { if (error) {
g_warning ("Error setting certificate (invalid data): (%d) %s", g_warning ("Error setting certificate (invalid data): %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -2985,8 +2985,8 @@ set_property (GObject *object, guint prop_id,
} }
priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error); priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error);
if (error) { if (error) {
g_warning ("Error setting private key (invalid data): (%d) %s", g_warning ("Error setting private key (invalid data): %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -3004,8 +3004,8 @@ set_property (GObject *object, guint prop_id,
} }
priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error); priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error);
if (error) { if (error) {
g_warning ("Error setting private key (invalid data): (%d) %s", g_warning ("Error setting private key (invalid data): %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
break; break;
@@ -3726,8 +3726,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
/* Initialize crypto lbrary. */ /* Initialize crypto lbrary. */
if (!nm_utils_init (&error)) { if (!nm_utils_init (&error)) {
g_warning ("Couldn't initilize nm-utils/crypto system: %d %s", g_warning ("Couldn't initilize nm-utils/crypto system: %s",
error->code, error->message); error->message);
g_error_free (error); g_error_free (error);
} }
} }

6
libnm-util/nm-utils.c
View File

@@ -1514,16 +1514,14 @@ nm_utils_uuid_generate_from_string (const char *s)
g_return_val_if_fail (s && *s, NULL); g_return_val_if_fail (s && *s, NULL);
if (!nm_utils_init (&error)) { if (!nm_utils_init (&error)) {
g_warning ("error initializing crypto: (%d) %s", g_warning ("error initializing crypto: %s", error->message);
error->code, error->message);
if (error) if (error)
g_error_free (error); g_error_free (error);
return NULL; return NULL;
} }
if (!crypto_md5_hash (NULL, 0, s, strlen (s), (char *) uuid, sizeof (uuid), &error)) { if (!crypto_md5_hash (NULL, 0, s, strlen (s), (char *) uuid, sizeof (uuid), &error)) {
g_warning ("error generating UUID: (%d) %s", g_warning ("error generating UUID: %s", error->message);
error->code, error->message);
if (error) if (error)
g_error_free (error); g_error_free (error);
return NULL; return NULL;

3
libnm/nm-object.c
View File

@@ -1280,11 +1280,10 @@ _nm_object_reload_property (NMObject *object,
G_DBUS_CALL_FLAGS_NONE, 15000, G_DBUS_CALL_FLAGS_NONE, 15000,
NULL, &err); NULL, &err);
if (!ret) { if (!ret) {
dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n", dbgmsg ("%s: Error getting '%s' for %s: %s\n",
__func__, __func__,
prop_name, prop_name,
nm_object_get_path (object), nm_object_get_path (object),
err->code,
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return; return;

3
libnm/nm-remote-connection.c
View File

@@ -564,10 +564,9 @@ replace_settings (NMRemoteConnection *self, GVariant *new_settings)
GError *error = NULL; GError *error = NULL;
if (!nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error)) { if (!nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error)) {
g_warning ("%s: error updating connection %s settings: (%d) %s", g_warning ("%s: error updating connection %s settings: %s",
__func__, __func__,
nm_connection_get_path (NM_CONNECTION (self)), nm_connection_get_path (NM_CONNECTION (self)),
error->code,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }

8
libnm/nm-vpn-plugin-old.c
View File

@@ -470,8 +470,8 @@ _connect_generic (NMVpnPluginOld *plugin,
g_dbus_method_invocation_return_error (context, g_dbus_method_invocation_return_error (context,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: (%d) %s", "Invalid connection: %s",
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -611,8 +611,8 @@ impl_vpn_plugin_old_new_secrets (NMVpnPluginOld *plugin,
g_dbus_method_invocation_return_error (context, g_dbus_method_invocation_return_error (context,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: (%d) %s", "Invalid connection: %s",
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }

8
libnm/nm-vpn-service-plugin.c
View File

@@ -486,8 +486,8 @@ _connect_generic (NMVpnServicePlugin *plugin,
g_dbus_method_invocation_return_error (context, g_dbus_method_invocation_return_error (context,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: (%d) %s", "Invalid connection: %s",
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }
@@ -631,8 +631,8 @@ impl_vpn_service_plugin_new_secrets (NMVpnServicePlugin *plugin,
g_dbus_method_invocation_return_error (context, g_dbus_method_invocation_return_error (context,
NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: (%d) %s", "Invalid connection: %s",
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }

4
src/devices/bluetooth/nm-bluez-device.c
View File

@@ -246,8 +246,8 @@ pan_connection_check_create (NMBluezDevice *self)
priv->pan_connection = added; priv->pan_connection = added;
nm_log_dbg (LOGD_BT, "bluez[%s] added new Bluetooth connection for NAP device: '%s' (%s)", priv->path, id, uuid); nm_log_dbg (LOGD_BT, "bluez[%s] added new Bluetooth connection for NAP device: '%s' (%s)", priv->path, id, uuid);
} else { } else {
nm_log_warn (LOGD_BT, "bluez[%s] couldn't add new Bluetooth connection for NAP device: '%s' (%s): %d / %s", nm_log_warn (LOGD_BT, "bluez[%s] couldn't add new Bluetooth connection for NAP device: '%s' (%s): %s",
priv->path, id, uuid, error->code, error->message); priv->path, id, uuid, error->message);
g_clear_error (&error); g_clear_error (&error);
} }

4
src/devices/bluetooth/nm-device-bt.c
View File

@@ -497,8 +497,8 @@ modem_ip4_config_result (NMModem *modem,
if (error) { if (error) {
_LOGW (LOGD_MB | LOGD_IP4 | LOGD_BT, _LOGW (LOGD_MB | LOGD_IP4 | LOGD_BT,
"retrieving IP4 configuration failed: (%d) %s", "retrieving IP4 configuration failed: %s",
error->code, error->message); error->message);
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
} else } else

2
src/devices/wifi/tests/test-wifi-ap-utils.c
View File

@@ -37,7 +37,7 @@
if (expected) { \ if (expected) { \
if (!success) { \ if (!success) { \
g_assert (error != NULL); \ g_assert (error != NULL); \
g_warning ("Failed to complete connection: (%d) %s", error->code, error->message); \ g_warning ("Failed to complete connection: %s", error->message); \
} \ } \
g_assert (success == TRUE); \ g_assert (success == TRUE); \
g_assert (error == NULL); \ g_assert (error == NULL); \

7
src/devices/wwan/nm-device-modem.c
View File

@@ -157,8 +157,8 @@ modem_ip4_config_result (NMModem *modem,
g_return_if_fail (nm_device_activate_ip4_state_in_conf (device) == TRUE); g_return_if_fail (nm_device_activate_ip4_state_in_conf (device) == TRUE);
if (error) { if (error) {
_LOGW (LOGD_MB | LOGD_IP4, "retrieving IPv4 configuration failed: (%d) %s", _LOGW (LOGD_MB | LOGD_IP4, "retrieving IPv4 configuration failed: %s",
error->code, error->message); error->message);
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
} else { } else {
@@ -184,8 +184,7 @@ modem_ip6_config_result (NMModem *modem,
g_return_if_fail (nm_device_activate_ip6_state_in_conf (device) == TRUE); g_return_if_fail (nm_device_activate_ip6_state_in_conf (device) == TRUE);
if (error) { if (error) {
_LOGW (LOGD_MB | LOGD_IP6, "retrieving IPv6 configuration failed: (%d) %s", _LOGW (LOGD_MB | LOGD_IP6, "retrieving IPv6 configuration failed: %s", error->message);
error->code, error->message);
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
return; return;

3
src/devices/wwan/nm-modem.c
View File

@@ -545,9 +545,8 @@ ppp_stage3_ip_config_start (NMModem *self,
ret = NM_ACT_STAGE_RETURN_POSTPONE; ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else { } else {
nm_log_err (LOGD_PPP, "(%s): error starting PPP: (%d) %s", nm_log_err (LOGD_PPP, "(%s): error starting PPP: %s",
nm_modem_get_uid (self), nm_modem_get_uid (self),
error->code,
error->message); error->message);
g_error_free (error); g_error_free (error);

14
src/dhcp-manager/nm-dhcp-dhclient.c
View File

@@ -362,9 +362,9 @@ dhclient_start (NMDhcpClient *client,
priv->lease_file = g_strdup (g_file_get_path (dst)); priv->lease_file = g_strdup (g_file_get_path (dst));
} else { } else {
/* Failure; just use the existing leasefile */ /* Failure; just use the existing leasefile */
nm_log_warn (log_domain, "Failed to copy leasefile %s to %s: (%d) %s", nm_log_warn (log_domain, "Failed to copy leasefile %s to %s: %s",
g_file_get_path (src), g_file_get_path (dst), g_file_get_path (src), g_file_get_path (dst),
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
g_object_unref (src); g_object_unref (src);
@@ -378,9 +378,8 @@ dhclient_start (NMDhcpClient *client,
success = nm_dhcp_dhclient_save_duid (priv->lease_file, escaped, &error); success = nm_dhcp_dhclient_save_duid (priv->lease_file, escaped, &error);
g_free (escaped); g_free (escaped);
if (!success) { if (!success) {
nm_log_warn (log_domain, "(%s): failed to save DUID to %s: (%d) %s.", nm_log_warn (log_domain, "(%s): failed to save DUID to %s: %s.",
iface, priv->lease_file, iface, priv->lease_file,
error->code,
error->message); error->message);
g_free (pid_file); g_free (pid_file);
return FALSE; return FALSE;
@@ -577,8 +576,8 @@ get_duid (NMDhcpClient *client)
duid = nm_dhcp_dhclient_read_duid (leasefile, &error); duid = nm_dhcp_dhclient_read_duid (leasefile, &error);
if (error) { if (error) {
nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': (%d) %s", nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': %s",
leasefile, error->code, error->message); leasefile, error->message);
g_clear_error (&error); g_clear_error (&error);
} }
g_free (leasefile); g_free (leasefile);
@@ -589,9 +588,8 @@ get_duid (NMDhcpClient *client)
nm_log_dbg (LOGD_DHCP, "Looking for default DHCPv6 DUID in '%s'.", priv->def_leasefile); nm_log_dbg (LOGD_DHCP, "Looking for default DHCPv6 DUID in '%s'.", priv->def_leasefile);
duid = nm_dhcp_dhclient_read_duid (priv->def_leasefile, &error); duid = nm_dhcp_dhclient_read_duid (priv->def_leasefile, &error);
if (error) { if (error) {
nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': (%d) %s", nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': %s",
priv->def_leasefile, priv->def_leasefile,
error->code,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }

4
src/dns-manager/nm-dns-dnsmasq.c
View File

@@ -283,9 +283,9 @@ update (NMDnsPlugin *plugin,
/* Write out the config file */ /* Write out the config file */
if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) { if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) {
nm_log_warn (LOGD_DNS, "Failed to write dnsmasq config file %s: (%d) %s", nm_log_warn (LOGD_DNS, "Failed to write dnsmasq config file %s: %s",
CONFFILE, CONFFILE,
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
goto out; goto out;
} }

4
src/dns-manager/nm-dns-plugin.c
View File

@@ -175,8 +175,8 @@ nm_dns_plugin_child_spawn (NMDnsPlugin *self,
nm_log_dbg (LOGD_DNS, "%s started with pid %d", priv->progname, priv->pid); nm_log_dbg (LOGD_DNS, "%s started with pid %d", priv->progname, priv->pid);
priv->watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) watch_cb, self); priv->watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) watch_cb, self);
} else { } else {
nm_log_warn (LOGD_DNS, "Failed to spawn %s: (%d) %s", nm_log_warn (LOGD_DNS, "Failed to spawn %s: %s",
priv->progname, error->code, error->message); priv->progname, error->message);
g_clear_error (&error); g_clear_error (&error);
} }

6
src/main.c
View File

@@ -358,8 +358,7 @@ main (int argc, char *argv[])
nm_config_cmd_line_options_free (config_cli); nm_config_cmd_line_options_free (config_cli);
config_cli = NULL; config_cli = NULL;
if (config == NULL) { if (config == NULL) {
fprintf (stderr, _("Failed to read configuration: (%d) %s\n"), fprintf (stderr, _("Failed to read configuration: %s\n"),
error->code,
error->message); error->message);
exit (1); exit (1);
} }
@@ -412,9 +411,8 @@ main (int argc, char *argv[])
/* Parse the state file */ /* Parse the state file */
if (!parse_state_file (global_opt.state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &error)) { if (!parse_state_file (global_opt.state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &error)) {
nm_log_err (LOGD_CORE, "State file %s parsing failed: (%d) %s", nm_log_err (LOGD_CORE, "State file %s parsing failed: %s",
global_opt.state_file, global_opt.state_file,
error->code,
error->message); error->message);
/* Not a hard failure */ /* Not a hard failure */
} }

4
src/nm-activation-request.c
View File

@@ -303,8 +303,8 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared)
nm_log_info (LOGD_SHARING, "Executing: %s", cmd); nm_log_info (LOGD_SHARING, "Executing: %s", cmd);
if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
NULL, NULL, NULL, NULL, &status, &error)) { NULL, NULL, NULL, NULL, &status, &error)) {
nm_log_warn (LOGD_SHARING, "Error executing command: (%d) %s", nm_log_warn (LOGD_SHARING, "Error executing command: %s",
error->code, error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} else if (WEXITSTATUS (status)) { } else if (WEXITSTATUS (status)) {
nm_log_warn (LOGD_SHARING, "** Command returned exit status %d.", nm_log_warn (LOGD_SHARING, "** Command returned exit status %d.",

4
src/nm-auth-utils.c
View File

@@ -335,8 +335,8 @@ pk_call_cb (GObject *object, GAsyncResult *result, gpointer user_data)
} }
if (error) { if (error) {
nm_log_warn (LOGD_CORE, "error requesting auth for %s: (%d) %s", nm_log_warn (LOGD_CORE, "error requesting auth for %s: %s",
call->permission, error->code, error->message); call->permission, error->message);
if (!call->chain->error) { if (!call->chain->error) {
call->chain->error = error; call->chain->error = error;

9
src/nm-manager.c
View File

@@ -1658,9 +1658,8 @@ assume_connection (NMManager *self, NMDevice *device, NMSettingsConnection *conn
g_object_unref (subject); g_object_unref (subject);
if (!active) { if (!active) {
_LOGW (LOGD_DEVICE, "assumed connection %s failed to activate: (%d) %s", _LOGW (LOGD_DEVICE, "assumed connection %s failed to activate: %s",
nm_connection_get_path (NM_CONNECTION (connection)), nm_connection_get_path (NM_CONNECTION (connection)),
error->code,
error->message); error->message);
g_error_free (error); g_error_free (error);
return FALSE; return FALSE;
@@ -4009,9 +4008,8 @@ _internal_enable (NMManager *self, gboolean enable)
G_TYPE_BOOLEAN, (gpointer) &enable, G_TYPE_BOOLEAN, (gpointer) &enable,
&err)) { &err)) {
/* Not a hard error */ /* Not a hard error */
_LOGW (LOGD_SUSPEND, "writing to state file %s failed: (%d) %s.", _LOGW (LOGD_SUSPEND, "writing to state file %s failed: %s",
priv->state_file, priv->state_file,
err->code,
err->message); err->message);
} }
} }
@@ -4971,9 +4969,8 @@ manager_radio_user_toggled (NMManager *self,
"main", rstate->key, "main", rstate->key,
G_TYPE_BOOLEAN, (gpointer) &enabled, G_TYPE_BOOLEAN, (gpointer) &enabled,
&error)) { &error)) {
_LOGW (LOGD_CORE, "writing to state file %s failed: (%d) %s.", _LOGW (LOGD_CORE, "writing to state file %s failed: %s",
priv->state_file, priv->state_file,
error->code,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }

3
src/ppp-manager/nm-pppd-plugin.c
View File

@@ -302,9 +302,8 @@ get_credentials (char *username, char *password)
G_DBUS_CALL_FLAGS_NONE, -1, G_DBUS_CALL_FLAGS_NONE, -1,
NULL, &err); NULL, &err);
if (!ret) { if (!ret) {
g_warning ("nm-ppp-plugin: (%s): could not get secrets: (%d) %s", g_warning ("nm-ppp-plugin: (%s): could not get secrets: %s",
__func__, __func__,
err->code,
err->message); err->message);
g_error_free (err); g_error_free (err);
return -1; return -1;

8
src/settings/nm-agent-manager.c
View File

@@ -263,8 +263,8 @@ agent_register_permissions_done (NMAuthChain *chain,
if (error) { if (error) {
local = g_error_new (NM_AGENT_MANAGER_ERROR, local = g_error_new (NM_AGENT_MANAGER_ERROR,
NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED, NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED,
"Failed to request agent permissions: (%d) %s", "Failed to request agent permissions: %s",
error->code, error->message); error->message);
g_dbus_method_invocation_take_error (context, local); g_dbus_method_invocation_take_error (context, local);
} else { } else {
agent = nm_auth_chain_steal_data (chain, "agent"); agent = nm_auth_chain_steal_data (chain, "agent");
@@ -987,9 +987,9 @@ _con_get_request_start_validated (NMAuthChain *chain,
req->con.chain = NULL; req->con.chain = NULL;
if (error) { if (error) {
_LOGD (req->current, "agent "LOG_REQ_FMT" MODIFY check error: (%d) %s", _LOGD (req->current, "agent "LOG_REQ_FMT" MODIFY check error: %s",
LOG_REQ_ARG (req), LOG_REQ_ARG (req),
error->code, error->message); error->message);
/* Try the next agent */ /* Try the next agent */
request_next_agent (req); request_next_agent (req);
} else { } else {

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

@@ -883,10 +883,8 @@ new_secrets_commit_cb (NMSettingsConnection *self,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
{ {
if (error) { if (error)
_LOGW ("Error saving new secrets to backing storage: (%d) %s", _LOGW ("Error saving new secrets to backing storage: %s", error->message);
error->code, error->message);
}
} }
static void static void
@@ -1086,18 +1084,16 @@ get_secrets_done_cb (NMAgentManager *manager,
} }
} else { } else {
_LOGD ("(%s:%p) failed to update with agent secrets: (%d) %s", _LOGD ("(%s:%p) failed to update with agent secrets: %s",
setting_name, setting_name,
info, info,
local->code,
local->message); local->message);
} }
g_variant_unref (filtered_secrets); g_variant_unref (filtered_secrets);
} else { } else {
_LOGD ("(%s:%p) failed to update with existing secrets: (%d) %s", _LOGD ("(%s:%p) failed to update with existing secrets: %s",
setting_name, setting_name,
info, info,
local->code,
local->message); local->message);
} }
@@ -2219,8 +2215,7 @@ nm_settings_connection_read_and_fill_timestamp (NMSettingsConnection *self)
priv->timestamp = timestamp; priv->timestamp = timestamp;
priv->timestamp_set = TRUE; priv->timestamp_set = TRUE;
} else { } else {
_LOGD ("failed to read connection timestamp: (%d) %s", _LOGD ("failed to read connection timestamp: %s", err->message);
err->code, err->message);
g_clear_error (&err); g_clear_error (&err);
} }
g_key_file_free (timestamps_file); g_key_file_free (timestamps_file);

4
src/settings/plugins/ifupdown/nm-ifupdown-connection.c
View File

@@ -95,10 +95,10 @@ constructor (GType type,
} }
if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), priv->ifblock, &error)) { if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), priv->ifblock, &error)) {
nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: (%d) %s", nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: %s",
__FILE__, __FILE__,
__LINE__, __LINE__,
error->code, error->message); error->message);
goto err; goto err;
} }

3
src/settings/plugins/keyfile/plugin.c
View File

@@ -404,9 +404,8 @@ read_connections (NMSettingsPlugin *config)
dir = g_dir_open (nm_keyfile_plugin_get_path (), 0, &error); dir = g_dir_open (nm_keyfile_plugin_get_path (), 0, &error);
if (!dir) { if (!dir) {
nm_log_warn (LOGD_SETTINGS, "keyfile: cannot read directory '%s': (%d) %s", nm_log_warn (LOGD_SETTINGS, "keyfile: cannot read directory '%s': %s",
nm_keyfile_plugin_get_path (), nm_keyfile_plugin_get_path (),
error->code,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;

4
src/vpn-manager/nm-vpn-connection.c
View File

@@ -2224,8 +2224,8 @@ get_secrets_cb (NMSettingsConnection *connection,
return; return;
if (error && priv->secrets_idx >= SECRETS_REQ_NEW) { if (error && priv->secrets_idx >= SECRETS_REQ_NEW) {
_LOGE ("Failed to request VPN secrets #%d: (%d) %s", _LOGE ("Failed to request VPN secrets #%d: %s",
priv->secrets_idx + 1, error->code, error->message); priv->secrets_idx + 1, error->message);
_set_vpn_state (self, STATE_FAILED, NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS, FALSE); _set_vpn_state (self, STATE_FAILED, NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS, FALSE);
return; return;
} }