diff options
34 files changed, 95 insertions, 126 deletions
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index de13bd0de3..7ddffb0493 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -549,8 +549,7 @@ script_dispatch (ScriptInfo *script) request->num_scripts_nowait++; return TRUE; } else { - _LOG_S_W (script, "complete: failed to execute script: %s (%d)", - error->message, error->code); + _LOG_S_W (script, "complete: failed to execute script: %s", error->message); script->result = DISPATCH_RESULT_EXEC_FAILED; script->error = g_strdup (error->message); request->num_scripts_done++; @@ -594,8 +593,8 @@ find_scripts (const char *str_action) dirname = NMD_SCRIPT_DIR_DEFAULT; if (!(dir = g_dir_open (dirname, 0, &error))) { - g_message ("find-scripts: Failed to open dispatcher directory '%s': (%d) %s", - dirname, error->code, error->message); + g_message ("find-scripts: Failed to open dispatcher directory '%s': %s", + dirname, error->message); g_error_free (error); return NULL; } diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 0ecb988af2..cc8ea66ed7 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -2907,8 +2907,7 @@ set_property (GObject *object, guint prop_id, g_bytes_unref (priv->ca_cert); priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", error->message); g_error_free (error); } break; @@ -2929,8 +2928,7 @@ set_property (GObject *object, guint prop_id, g_bytes_unref (priv->client_cert); priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", error->message); g_error_free (error); } break; @@ -2959,8 +2957,7 @@ set_property (GObject *object, guint prop_id, g_bytes_unref (priv->phase2_ca_cert); priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", error->message); g_error_free (error); } break; @@ -2981,8 +2978,7 @@ set_property (GObject *object, guint prop_id, g_bytes_unref (priv->phase2_client_cert); priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", error->message); g_error_free (error); } break; @@ -3006,8 +3002,7 @@ set_property (GObject *object, guint prop_id, g_bytes_unref (priv->private_key); priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error); if (error) { - g_warning ("Error setting private key (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting private key (invalid data): %s", error->message); g_error_free (error); } break; @@ -3023,8 +3018,7 @@ set_property (GObject *object, guint prop_id, g_bytes_unref (priv->phase2_private_key); priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error); if (error) { - g_warning ("Error setting private key (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting private key (invalid data): %s", error->message); g_error_free (error); } break; diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index db6e7ab732..aa79e1ac04 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -139,8 +139,8 @@ _nm_active_connection_type_for_path (DBusGConnection *connection, else type = NM_TYPE_ACTIVE_CONNECTION; } else { - g_warning ("Error in getting active connection 'Vpn' property: (%d) %s", - error->code, error->message); + g_warning ("Error in getting active connection 'Vpn' property: %s", + error->message); g_error_free (error); type = G_TYPE_INVALID; } diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 3c0564684b..13d02943f4 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -513,7 +513,7 @@ activate_info_complete (ActivateInfo *info, error, info->user_data); } 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); } @@ -1839,8 +1839,8 @@ constructed (GObject *object) GError *error = NULL; if (!nm_utils_init (&error)) { - g_warning ("Couldn't initilize nm-utils/crypto system: %d %s", - error->code, error->message); + g_warning ("Couldn't initilize nm-utils/crypto system: %s", + error->message); g_clear_error (&error); } diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 779f4b7c1c..3392d230d3 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -2198,11 +2198,10 @@ device_operation_cb (DBusGProxy *proxy, if (info->fn) info->fn (info->device, error, info->user_data); else if (error) { - g_warning ("%s: device %s %s failed: (%d) %s", + g_warning ("%s: device %s %s failed: %s", __func__, nm_object_get_path (NM_OBJECT (info->device)), info->method, - error->code, NM_G_ERROR_MSG (error)); } g_clear_error (&error); diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index b252dc7a6d..c7201cda26 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -1402,11 +1402,10 @@ _nm_object_reload_property (NMObject *object, G_TYPE_INVALID, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n", + dbgmsg ("%s: Error getting '%s' for %s: %s\n", __func__, prop_name, nm_object_get_path (object), - err->code, err->message); g_clear_error (&err); return; diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index e043fdb1a8..132032f488 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -454,10 +454,10 @@ replace_settings (NMRemoteConnection *self, GHashTable *new_settings) if (nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error)) g_signal_emit (self, signals[UPDATED], 0, new_settings); else { - g_warning ("%s: error updating connection %s settings: (%d) %s", + g_warning ("%s: error updating connection %s settings: %s", __func__, nm_connection_get_path (NM_CONNECTION (self)), - error->code, error->message); + error->message); g_clear_error (&error); g_signal_emit (self, signals[REMOVED], 0); diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 42d90f6ae2..b64743a99c 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -574,9 +574,8 @@ fetch_connections_done (DBusGProxy *proxy, if ( !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN) && !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NAME_HAS_NO_OWNER) && priv->service_running) { - g_warning ("%s: error fetching connections: (%d) %s.", + g_warning ("%s: error fetching connections: %s.", __func__, - error->code, error->message ? error->message : "(unknown)"); } g_clear_error (&error); diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 073729da5d..0a86245568 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -330,8 +330,8 @@ verify_request (NMSecretAgent *self, g_set_error (error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, - "Invalid connection: (%d) %s", - local->code, local->message); + "Invalid connection: %s", + local->message); g_clear_error (&local); } diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 9f941fcb60..d117e53092 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -455,8 +455,7 @@ _connect_generic (NMVPNPlugin *plugin, connection = nm_connection_new_from_hash (properties, &local); if (!connection) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid connection: (%d) %s", - local->code, local->message); + "Invalid connection: %s", local->message); g_clear_error (&local); return FALSE; } @@ -537,9 +536,9 @@ impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin, g_set_error (err, NM_VPN_PLUGIN_ERROR, 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)), - cnfh_err->message, cnfh_err->code); + cnfh_err->message); g_error_free (cnfh_err); return FALSE; } @@ -595,8 +594,8 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin, connection = nm_connection_new_from_hash (properties, &local); if (!connection) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid connection: (%d) %s", - local->code, local->message); + "Invalid connection: %s", + local->message); g_clear_error (&local); return FALSE; } diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index f476b2489b..4f974a413a 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -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); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", + error->message); g_error_free (error); } 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); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", + error->message); g_error_free (error); } 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); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", + error->message); g_error_free (error); } 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); if (error) { - g_warning ("Error setting certificate (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting certificate (invalid data): %s", + error->message); g_error_free (error); } 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); if (error) { - g_warning ("Error setting private key (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting private key (invalid data): %s", + error->message); g_error_free (error); } 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); if (error) { - g_warning ("Error setting private key (invalid data): (%d) %s", - error->code, error->message); + g_warning ("Error setting private key (invalid data): %s", + error->message); g_error_free (error); } break; @@ -3726,8 +3726,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) /* Initialize crypto lbrary. */ if (!nm_utils_init (&error)) { - g_warning ("Couldn't initilize nm-utils/crypto system: %d %s", - error->code, error->message); + g_warning ("Couldn't initilize nm-utils/crypto system: %s", + error->message); g_error_free (error); } } diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index e9f20a1c77..24f233f913 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1514,16 +1514,14 @@ nm_utils_uuid_generate_from_string (const char *s) g_return_val_if_fail (s && *s, NULL); if (!nm_utils_init (&error)) { - g_warning ("error initializing crypto: (%d) %s", - error->code, error->message); + g_warning ("error initializing crypto: %s", error->message); if (error) g_error_free (error); return NULL; } if (!crypto_md5_hash (NULL, 0, s, strlen (s), (char *) uuid, sizeof (uuid), &error)) { - g_warning ("error generating UUID: (%d) %s", - error->code, error->message); + g_warning ("error generating UUID: %s", error->message); if (error) g_error_free (error); return NULL; diff --git a/libnm/nm-object.c b/libnm/nm-object.c index b35f6822a5..9a5dcd6f0d 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -1280,11 +1280,10 @@ _nm_object_reload_property (NMObject *object, G_DBUS_CALL_FLAGS_NONE, 15000, NULL, &err); if (!ret) { - dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n", + dbgmsg ("%s: Error getting '%s' for %s: %s\n", __func__, prop_name, nm_object_get_path (object), - err->code, err->message); g_clear_error (&err); return; diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 7a739e2cb1..c4a0b6aeb0 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -564,10 +564,9 @@ replace_settings (NMRemoteConnection *self, GVariant *new_settings) GError *error = NULL; 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__, nm_connection_get_path (NM_CONNECTION (self)), - error->code, error->message); g_clear_error (&error); } diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 19f14176fa..74861edc46 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -470,8 +470,8 @@ _connect_generic (NMVpnPluginOld *plugin, g_dbus_method_invocation_return_error (context, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid connection: (%d) %s", - error->code, error->message); + "Invalid connection: %s", + error->message); g_clear_error (&error); } @@ -611,8 +611,8 @@ impl_vpn_plugin_old_new_secrets (NMVpnPluginOld *plugin, g_dbus_method_invocation_return_error (context, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid connection: (%d) %s", - error->code, error->message); + "Invalid connection: %s", + error->message); g_clear_error (&error); return; } diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 5fbd359025..876d479817 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -486,8 +486,8 @@ _connect_generic (NMVpnServicePlugin *plugin, g_dbus_method_invocation_return_error (context, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid connection: (%d) %s", - error->code, error->message); + "Invalid connection: %s", + error->message); g_clear_error (&error); return; } @@ -631,8 +631,8 @@ impl_vpn_service_plugin_new_secrets (NMVpnServicePlugin *plugin, g_dbus_method_invocation_return_error (context, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid connection: (%d) %s", - error->code, error->message); + "Invalid connection: %s", + error->message); g_clear_error (&error); return; } diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 231fd9a114..a009746d02 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -246,8 +246,8 @@ pan_connection_check_create (NMBluezDevice *self) priv->pan_connection = added; nm_log_dbg (LOGD_BT, "bluez[%s] added new Bluetooth connection for NAP device: '%s' (%s)", priv->path, id, uuid); } else { - nm_log_warn (LOGD_BT, "bluez[%s] couldn't add new Bluetooth connection for NAP device: '%s' (%s): %d / %s", - priv->path, id, uuid, error->code, error->message); + nm_log_warn (LOGD_BT, "bluez[%s] couldn't add new Bluetooth connection for NAP device: '%s' (%s): %s", + priv->path, id, uuid, error->message); g_clear_error (&error); } diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 9ac791faf3..4ecb56edbc 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -497,8 +497,8 @@ modem_ip4_config_result (NMModem *modem, if (error) { _LOGW (LOGD_MB | LOGD_IP4 | LOGD_BT, - "retrieving IP4 configuration failed: (%d) %s", - error->code, error->message); + "retrieving IP4 configuration failed: %s", + error->message); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } else diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c index 01990beed7..838368c479 100644 --- a/src/devices/wifi/tests/test-wifi-ap-utils.c +++ b/src/devices/wifi/tests/test-wifi-ap-utils.c @@ -37,7 +37,7 @@ if (expected) { \ if (!success) { \ 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 (error == NULL); \ diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index 8bc631f238..a8361c4976 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -157,8 +157,8 @@ modem_ip4_config_result (NMModem *modem, g_return_if_fail (nm_device_activate_ip4_state_in_conf (device) == TRUE); if (error) { - _LOGW (LOGD_MB | LOGD_IP4, "retrieving IPv4 configuration failed: (%d) %s", - error->code, error->message); + _LOGW (LOGD_MB | LOGD_IP4, "retrieving IPv4 configuration failed: %s", + error->message); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } else { @@ -184,8 +184,7 @@ modem_ip6_config_result (NMModem *modem, g_return_if_fail (nm_device_activate_ip6_state_in_conf (device) == TRUE); if (error) { - _LOGW (LOGD_MB | LOGD_IP6, "retrieving IPv6 configuration failed: (%d) %s", - error->code, error->message); + _LOGW (LOGD_MB | LOGD_IP6, "retrieving IPv6 configuration failed: %s", error->message); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); return; diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index b01f0139d0..2a8a9d1e92 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -545,9 +545,8 @@ ppp_stage3_ip_config_start (NMModem *self, ret = NM_ACT_STAGE_RETURN_POSTPONE; } 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), - error->code, error->message); g_error_free (error); diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index feeada62b6..e5329ef33c 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -362,9 +362,9 @@ dhclient_start (NMDhcpClient *client, priv->lease_file = g_strdup (g_file_get_path (dst)); } else { /* 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), - error->code, error->message); + error->message); g_clear_error (&error); } g_object_unref (src); @@ -378,9 +378,8 @@ dhclient_start (NMDhcpClient *client, success = nm_dhcp_dhclient_save_duid (priv->lease_file, escaped, &error); g_free (escaped); 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, - error->code, error->message); g_free (pid_file); return FALSE; @@ -577,8 +576,8 @@ get_duid (NMDhcpClient *client) duid = nm_dhcp_dhclient_read_duid (leasefile, &error); if (error) { - nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': (%d) %s", - leasefile, error->code, error->message); + nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': %s", + leasefile, error->message); g_clear_error (&error); } 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); duid = nm_dhcp_dhclient_read_duid (priv->def_leasefile, &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, - error->code, error->message); g_clear_error (&error); } diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 1a9b71587a..919fa67608 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -283,9 +283,9 @@ update (NMDnsPlugin *plugin, /* Write out the config file */ 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, - error->code, error->message); + error->message); g_clear_error (&error); goto out; } diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index 0bfd94abd3..6bdcbce168 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -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); priv->watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) watch_cb, self); } else { - nm_log_warn (LOGD_DNS, "Failed to spawn %s: (%d) %s", - priv->progname, error->code, error->message); + nm_log_warn (LOGD_DNS, "Failed to spawn %s: %s", + priv->progname, error->message); g_clear_error (&error); } diff --git a/src/main.c b/src/main.c index 4657ffe250..0f074b012d 100644 --- a/src/main.c +++ b/src/main.c @@ -358,8 +358,7 @@ main (int argc, char *argv[]) nm_config_cmd_line_options_free (config_cli); config_cli = NULL; if (config == NULL) { - fprintf (stderr, _("Failed to read configuration: (%d) %s\n"), - error->code, + fprintf (stderr, _("Failed to read configuration: %s\n"), error->message); exit (1); } @@ -412,9 +411,8 @@ main (int argc, char *argv[]) /* Parse the state file */ 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, - error->code, error->message); /* Not a hard failure */ } diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index ed539b6898..acc3e4ca76 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -303,8 +303,8 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared) 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, NULL, NULL, NULL, NULL, &status, &error)) { - nm_log_warn (LOGD_SHARING, "Error executing command: (%d) %s", - error->code, error->message); + nm_log_warn (LOGD_SHARING, "Error executing command: %s", + error->message); g_clear_error (&error); } else if (WEXITSTATUS (status)) { nm_log_warn (LOGD_SHARING, "** Command returned exit status %d.", diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index e741546bbc..928e88b0c4 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -335,8 +335,8 @@ pk_call_cb (GObject *object, GAsyncResult *result, gpointer user_data) } if (error) { - nm_log_warn (LOGD_CORE, "error requesting auth for %s: (%d) %s", - call->permission, error->code, error->message); + nm_log_warn (LOGD_CORE, "error requesting auth for %s: %s", + call->permission, error->message); if (!call->chain->error) { call->chain->error = error; diff --git a/src/nm-manager.c b/src/nm-manager.c index e463fc025f..e7eb7c63c8 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1658,9 +1658,8 @@ assume_connection (NMManager *self, NMDevice *device, NMSettingsConnection *conn g_object_unref (subject); 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)), - error->code, error->message); g_error_free (error); return FALSE; @@ -4009,9 +4008,8 @@ _internal_enable (NMManager *self, gboolean enable) G_TYPE_BOOLEAN, (gpointer) &enable, &err)) { /* 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, - err->code, err->message); } } @@ -4971,9 +4969,8 @@ manager_radio_user_toggled (NMManager *self, "main", rstate->key, G_TYPE_BOOLEAN, (gpointer) &enabled, &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, - error->code, error->message); g_clear_error (&error); } diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index a4dd4af7c1..4c16f1f0f1 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -302,9 +302,8 @@ get_credentials (char *username, char *password) G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err); 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__, - err->code, err->message); g_error_free (err); return -1; diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index a165f87fcd..455871de12 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -263,8 +263,8 @@ agent_register_permissions_done (NMAuthChain *chain, if (error) { local = g_error_new (NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED, - "Failed to request agent permissions: (%d) %s", - error->code, error->message); + "Failed to request agent permissions: %s", + error->message); g_dbus_method_invocation_take_error (context, local); } else { agent = nm_auth_chain_steal_data (chain, "agent"); @@ -987,9 +987,9 @@ _con_get_request_start_validated (NMAuthChain *chain, req->con.chain = NULL; 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), - error->code, error->message); + error->message); /* Try the next agent */ request_next_agent (req); } else { diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 5f444ea067..10aa77ab41 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -883,10 +883,8 @@ new_secrets_commit_cb (NMSettingsConnection *self, GError *error, gpointer user_data) { - if (error) { - _LOGW ("Error saving new secrets to backing storage: (%d) %s", - error->code, error->message); - } + if (error) + _LOGW ("Error saving new secrets to backing storage: %s", error->message); } static void @@ -1086,18 +1084,16 @@ get_secrets_done_cb (NMAgentManager *manager, } } else { - _LOGD ("(%s:%p) failed to update with agent secrets: (%d) %s", + _LOGD ("(%s:%p) failed to update with agent secrets: %s", setting_name, info, - local->code, local->message); } g_variant_unref (filtered_secrets); } else { - _LOGD ("(%s:%p) failed to update with existing secrets: (%d) %s", + _LOGD ("(%s:%p) failed to update with existing secrets: %s", setting_name, info, - local->code, local->message); } @@ -2219,8 +2215,7 @@ nm_settings_connection_read_and_fill_timestamp (NMSettingsConnection *self) priv->timestamp = timestamp; priv->timestamp_set = TRUE; } else { - _LOGD ("failed to read connection timestamp: (%d) %s", - err->code, err->message); + _LOGD ("failed to read connection timestamp: %s", err->message); g_clear_error (&err); } g_key_file_free (timestamps_file); diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index 8122fb2c74..93b106b8ea 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -95,10 +95,10 @@ constructor (GType type, } 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__, __LINE__, - error->code, error->message); + error->message); goto err; } diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index b948023a47..6003c7457f 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -404,9 +404,8 @@ read_connections (NMSettingsPlugin *config) dir = g_dir_open (nm_keyfile_plugin_get_path (), 0, &error); 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 (), - error->code, error->message); g_clear_error (&error); return; diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 653b997231..54d20b1914 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -2224,8 +2224,8 @@ get_secrets_cb (NMSettingsConnection *connection, return; if (error && priv->secrets_idx >= SECRETS_REQ_NEW) { - _LOGE ("Failed to request VPN secrets #%d: (%d) %s", - priv->secrets_idx + 1, error->code, error->message); + _LOGE ("Failed to request VPN secrets #%d: %s", + priv->secrets_idx + 1, error->message); _set_vpn_state (self, STATE_FAILED, NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS, FALSE); return; } |