diff options
| author | Dan Winship <danw@gnome.org> | 2014-04-07 17:55:26 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-06-20 11:23:43 -0400 |
| commit | 0b9d1a8fdf3058db8f8e6b6feb850bc58ae52f83 (patch) | |
| tree | 80fe065b6b4487886251ebae99c33c2bdc43c663 | |
| parent | 73508704d888d0d83855348b0ca01a2f4d7b2207 (diff) | |
| download | NetworkManager-0b9d1a8fdf3058db8f8e6b6feb850bc58ae52f83.tar.gz | |
all: clean up usage of GError
Functions that take a GError** MUST fill it in on error. There is no
need to check whether error is NULL if the function it was passed to
had a failing return value.
Likewise, a proper GError must have a non-NULL message, so there's no
need to double-check that either.
50 files changed, 202 insertions, 252 deletions
diff --git a/cli/src/connections.c b/cli/src/connections.c index d17f7f1264..4804318573 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -1913,10 +1913,11 @@ nmc_activate_connection (NmCli *nmc, /* Virtual connection may not have their interfaces created yet */ if (!device_found && !is_connection_virtual (connection)) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_CON_ACTIVATION, - "%s", local && local->message ? local->message : _("unknown error")); + "%s", local->message); g_clear_error (&local); return FALSE; } + g_clear_error (&local); } else if (ifname) { device = nm_client_get_device_by_iface (nmc->client, ifname); if (!device) { @@ -2043,8 +2044,8 @@ do_connection_up (NmCli *nmc, int argc, char **argv) if (!nmc_activate_connection (nmc, connection, ifname, ap, nsp, activate_connection_cb, &error)) { g_string_printf (nmc->return_text, _("Error: %s."), - error ? error->message : _("unknown error")); - nmc->return_value = error ? error->code : NMC_RESULT_ERROR_CON_ACTIVATION; + error->message); + nmc->return_value = error->code; g_clear_error (&error); goto error; } diff --git a/cli/src/devices.c b/cli/src/devices.c index 17492066b6..b531150699 100644 --- a/cli/src/devices.c +++ b/cli/src/devices.c @@ -1339,7 +1339,7 @@ connect_device_cb (NMClient *client, NMActiveConnection *active, GError *error, if (error) { g_string_printf (nmc->return_text, _("Error: Device activation failed: %s"), - error->message ? error->message : _("(unknown)")); + error->message); nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; quit (); } else { @@ -1481,7 +1481,7 @@ disconnect_device_cb (NMDevice *device, GError *error, gpointer user_data) g_string_printf (nmc->return_text, _("Error: Device '%s' (%s) disconnecting failed: %s"), nm_device_get_iface (device), nm_object_get_path (NM_OBJECT (device)), - error->message ? error->message : _("(unknown)")); + error->message); nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT; quit (); } else { @@ -2266,8 +2266,7 @@ request_rescan_cb (NMDeviceWifi *device, GError *error, gpointer user_data) NmCli *nmc = (NmCli *) user_data; if (error) { - g_string_printf (nmc->return_text, _("Error: %s."), - error->message ? error->message : _("unknown")); + g_string_printf (nmc->return_text, _("Error: %s."), error->message); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; } quit (); diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index de4193df5f..8f29e142dc 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -2089,8 +2089,7 @@ deactivate_cb (DBusGProxy *proxy, g_warning ("%s: device %s deactivation failed: (%d) %s", __func__, nm_object_get_path (NM_OBJECT (info->device)), - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); } g_clear_error (&error); diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 9f5d611c34..1cd33ccde9 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -460,8 +460,7 @@ replace_settings (NMRemoteConnection *self, GHashTable *new_settings) g_warning ("%s: error updating connection %s settings: (%d) %s", __func__, nm_connection_get_path (NM_CONNECTION (self)), - error ? error->code : -1, - (error && error->message) ? error->message : "(unknown)"); + error->code, 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 c36a92c856..4f8695a83c 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -492,7 +492,7 @@ connection_inited (GObject *source, GAsyncResult *result, gpointer user_data) local = g_error_new (NM_REMOTE_SETTINGS_ERROR, NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, "Connection not visible or not available: %s", - error ? error->message : "(unknown)"); + error->message); add_connection_info_complete (self, addinfo, local); g_error_free (local); } @@ -568,7 +568,7 @@ fetch_connections_done (DBusGProxy *proxy, g_warning ("%s: error fetching connections: (%d) %s.", __func__, error->code, - error->message ? error->message : "(unknown)"); + error->message); } g_clear_error (&error); diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index e5150d3304..bccdf75b23 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -340,8 +340,7 @@ verify_request (NMSecretAgent *self, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, "Invalid connection: (%d) %s", - local ? local->code : -1, - (local && local->message) ? local->message : "(unknown)"); + local->code, local->message); g_clear_error (&local); } diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 28019c30a9..59bb5f6aea 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1490,8 +1490,7 @@ nm_utils_uuid_generate_from_string (const char *s) if (!nm_utils_init (&error)) { g_warning ("error initializing crypto: (%d) %s", - error ? error->code : 0, - error ? error->message : "unknown"); + error->code, error->message); if (error) g_error_free (error); return NULL; @@ -1500,8 +1499,7 @@ nm_utils_uuid_generate_from_string (const char *s) uuid = g_malloc0 (sizeof (*uuid)); if (!crypto_md5_hash (NULL, 0, s, strlen (s), (char *) uuid, sizeof (*uuid), &error)) { g_warning ("error generating UUID: (%d) %s", - error ? error->code : 0, - error ? error->message : "unknown"); + error->code, error->message); if (error) g_error_free (error); goto out; diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index 73fc9224b0..4710cb8cd1 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.c @@ -129,7 +129,8 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) ASSERT (nm_connection_verify (connection, &error) == TRUE, detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); + g_clear_error (&error); return connection; } @@ -297,7 +298,7 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) ASSERT (nm_connection_verify (connection, &error) == TRUE, detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); return connection; } diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 5630727b7e..e131fb778c 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -246,8 +246,7 @@ pan_connection_check_create (NMBluezDevice *self) 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 ? error->code : -1, - (error && error->message) ? error->message : "(unknown)"); + priv->path, id, uuid, error->code, error->message); g_clear_error (&error); g_object_unref (connection); @@ -812,7 +811,7 @@ get_properties_cb_4 (GObject *source_object, GAsyncResult *res, gpointer user_da v_properties = g_dbus_proxy_call_finish (priv->proxy, res, &err); if (!v_properties) { nm_log_warn (LOGD_BT, "bluez[%s] error getting device properties: %s", - priv->path, err && err->message ? err->message : "(unknown)"); + priv->path, err->message); g_error_free (err); g_signal_emit (self, signals[INITIALIZED], 0, FALSE); goto END; diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c index df4c3bbd6d..4c75dfc295 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.c +++ b/src/devices/bluetooth/nm-bluez4-adapter.c @@ -199,8 +199,7 @@ get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) if (!dbus_g_proxy_end_call (proxy, call, &err, DBUS_TYPE_G_MAP_OF_VARIANT, &properties, G_TYPE_INVALID)) { - nm_log_warn (LOGD_BT, "bluez error getting adapter properties: %s", - err && err->message ? err->message : "(unknown)"); + nm_log_warn (LOGD_BT, "bluez error getting adapter properties: %s", err->message); g_error_free (err); goto done; } diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c index 2660cbd924..89d8cf5f78 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.c +++ b/src/devices/bluetooth/nm-bluez4-manager.c @@ -178,8 +178,7 @@ default_adapter_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) if ( !dbus_g_error_has_name (err, "org.bluez.Error.NoSuchAdapter") && !dbus_g_error_has_name (err, "org.freedesktop.systemd1.LoadFailed") && !g_error_matches (err, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN)) { - nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s", - err && err->message ? err->message : "(unknown)"); + nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s", err->message); } g_error_free (err); return; diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index 63006b3ab8..49981ee641 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -220,7 +220,7 @@ get_managed_objects_cb (GDBusProxy *proxy, nm_log_warn (LOGD_BT, "Couldn't get managed objects: not running Bluez5?"); else { nm_log_warn (LOGD_BT, "Couldn't get managed objects: %s", - error && error->message ? error->message : "(unknown)"); + error->message); } g_clear_error (&error); return; @@ -248,7 +248,7 @@ on_proxy_acquired (GObject *object, if (!priv->proxy) { nm_log_warn (LOGD_BT, "Couldn't acquire object manager proxy: %s", - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); return; } diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 8c2b57e79a..5096b0f8b4 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -504,8 +504,7 @@ modem_ip4_config_result (NMModem *self, nm_log_warn (LOGD_MB | LOGD_IP4 | LOGD_BT, "(%s): retrieving IP4 configuration failed: (%d) %s", nm_device_get_ip_iface (device), - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } else @@ -752,7 +751,7 @@ bluez_connect_cb (GObject *object, if (!device) { nm_log_warn (LOGD_BT, "Error connecting with bluez: %s", - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); nm_device_state_changed (NM_DEVICE (self), diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index e3bfdce2f2..30d0bd98ba 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -205,7 +205,7 @@ _update_s390_subchannels (NMDeviceEthernet *self) if (!dir) { nm_log_warn (LOGD_DEVICE | LOGD_HW, "(%s): failed to open directory '%s': %s", iface, parent_path, - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); goto out; } diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index be86706512..dae6d95097 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2549,7 +2549,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason) "Activation (%s) Stage 3 of 5 (IP Configure Start) failed" " to start avahi-autoipd: %s", iface, - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); aipd_cleanup (self); return NM_ACT_STAGE_RETURN_FAILURE; @@ -4343,8 +4343,7 @@ share_init (void) if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, share_child_setup, NULL, NULL, NULL, &status, &error)) { nm_log_err (LOGD_SHARING, "error loading NAT module %s: (%d) %s", - *iter, error ? error->code : 0, - (error && error->message) ? error->message : "unknown"); + *iter, error->code, error->message); if (error) g_error_free (error); } @@ -4417,7 +4416,7 @@ start_sharing (NMDevice *self, NMIP4Config *config) if (!nm_dnsmasq_manager_start (priv->dnsmasq_manager, config, &error)) { nm_log_err (LOGD_SHARING, "(%s/%s): failed to start dnsmasq: %s", nm_device_get_iface (self), ip_iface, - (error && error->message) ? error->message : "(unknown)"); + error->message); g_error_free (error); nm_act_request_set_shared (req, FALSE); return FALSE; diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index 740bf85b3e..9c3a00df96 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -158,8 +158,7 @@ modem_ip4_config_result (NMModem *self, if (error) { nm_log_warn (LOGD_MB | LOGD_IP4, "retrieving IP4 configuration failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } else diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 27255660ee..8cd8361453 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -184,7 +184,7 @@ connect_ready (MMModemSimple *simple_iface, nm_log_warn (LOGD_MB, "(%s) failed to connect modem: %s", nm_modem_get_uid (NM_MODEM (self)), - error && error->message ? error->message : "(unknown)"); + error->message); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error)); } @@ -542,7 +542,7 @@ modem_disable_ready (MMModem *modem_iface, } else { nm_log_warn (LOGD_MB, "(%s) failed to disable modem: %s", nm_modem_get_uid (NM_MODEM (self)), - error && error->message ? error->message : "(unknown)"); + error->message); nm_modem_set_prev_state (NM_MODEM (self), "disable failed"); g_clear_error (&error); } @@ -561,7 +561,7 @@ modem_enable_ready (MMModem *modem_iface, if (!mm_modem_enable_finish (modem_iface, res, &error)) { nm_log_warn (LOGD_MB, "(%s) failed to enable modem: %s", nm_modem_get_uid (NM_MODEM (self)), - error && error->message ? error->message : "(unknown)"); + error->message); nm_modem_set_prev_state (NM_MODEM (self), "enable failed"); g_clear_error (&error); } @@ -712,7 +712,7 @@ simple_disconnect_ready (MMModemSimple *modem_iface, if (ctx->warn) nm_log_warn (LOGD_MB, "(%s) failed to disconnect modem: %s", nm_modem_get_uid (NM_MODEM (ctx->self)), - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); } diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index c48117004e..50779c0adb 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -131,13 +131,12 @@ create_modem (NMModemManager *self, const char *path) handle_new_modem (self, modem); else { nm_log_warn (LOGD_MB, "failed to create modem: %s", - error ? error->message : "(unknown)"); + error->message); } g_hash_table_destroy (properties); } else { nm_log_warn (LOGD_MB, "could not get modem properties: %s %s", - error ? dbus_g_error_get_name (error) : "(none)", - error ? error->message : "(unknown)"); + dbus_g_error_get_name (error), error->message); } g_object_unref (proxy); @@ -403,7 +402,7 @@ modem_object_added (MMManager *modem_manager, handle_new_modem (self, modem); else { nm_log_warn (LOGD_MB, "failed to create modem: %s", - error ? error->message : "(unknown)"); + error->message); } g_clear_error (&error); } diff --git a/src/devices/wwan/nm-modem-old.c b/src/devices/wwan/nm-modem-old.c index ce1a382e19..73f20f5338 100644 --- a/src/devices/wwan/nm-modem-old.c +++ b/src/devices/wwan/nm-modem-old.c @@ -202,8 +202,7 @@ set_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { nm_log_warn (LOGD_MB, "failed to enable/disable modem: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); nm_modem_set_prev_state (NM_MODEM (user_data), "enable/disable failed"); } /* Wait for the state change signal to indicate enabled state changed */ @@ -268,8 +267,7 @@ stage1_prepare_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data if (!asked) { nm_log_warn (LOGD_MB, "Mobile connection failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error)); } g_error_free (error); @@ -326,8 +324,7 @@ stage1_pin_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) priv->enable_delay_id = g_timeout_add_seconds (4, (GSourceFunc) do_enable, self); } else { nm_log_warn (LOGD_MB, "GSM PIN unlock failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); /* try to translate the error reason */ reason = translate_mm_error (error); @@ -381,8 +378,7 @@ stage1_enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_da handle_enable_pin_required (self); else { nm_log_warn (LOGD_MB, "Modem enable failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); /* try to translate the error reason */ reason = translate_mm_error (error); @@ -636,8 +632,7 @@ disconnect_done (DBusGProxy *proxy, if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID) && warn) { nm_log_info (LOGD_MB, "disconnect failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); } } diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 2df9f2c23e..3111e0a96f 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -358,8 +358,7 @@ ppp_stage3_ip4_config_start (NMModem *self, ret = NM_ACT_STAGE_RETURN_POSTPONE; } else { nm_log_err (LOGD_PPP, "error starting PPP: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_error_free (error); g_object_unref (priv->ppp_manager); diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 4232ee0cce..cd053588b1 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -402,8 +402,7 @@ dhclient_start (NMDHCPClient *client, if (!success) { nm_log_warn (log_domain, "(%s): failed to save DUID to %s: (%d) %s.", iface, priv->lease_file, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); return -1; } } @@ -575,8 +574,7 @@ get_duid (NMDHCPClient *client) if (error) { nm_log_warn (LOGD_DHCP, "Failed to read leasefile '%s': (%d) %s", priv->def_leasefile, - error ? error->code : -1, - error ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } } diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index ab6966cbb6..96211e057a 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -546,7 +546,7 @@ nm_dhcp_manager_test_ip4_options_to_config (const char *dhcp_client, client_type = get_client_type (dhcp_client, &error); if (!client_type) { - nm_log_err (LOGD_DHCP4, "error: %s", error ? error->message : "(unknown)"); + nm_log_err (LOGD_DHCP4, "error: %s", error->message); g_clear_error (&error); return NULL; } diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 8367693da7..2e0640a9ae 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -271,8 +271,7 @@ update (NMDnsPlugin *plugin, if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) { nm_log_warn (LOGD_DNS, "Failed to write dnsmasq config file %s: (%d) %s", CONFFILE, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); goto out; } diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 466aa9a84f..c7d6a6fa5c 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -793,8 +793,7 @@ plugin_failed (NMDnsPlugin *plugin, gpointer user_data) /* Disable caching until the next DNS update */ if (!update_dns (self, TRUE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } } @@ -832,8 +831,7 @@ nm_dns_manager_add_ip4_config (NMDnsManager *mgr, if (!priv->updates_queue && !update_dns (mgr, FALSE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } @@ -866,8 +864,7 @@ nm_dns_manager_remove_ip4_config (NMDnsManager *mgr, NMIP4Config *config) if (!priv->updates_queue && !update_dns (mgr, FALSE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } @@ -909,8 +906,7 @@ nm_dns_manager_add_ip6_config (NMDnsManager *mgr, if (!priv->updates_queue && !update_dns (mgr, FALSE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } @@ -943,8 +939,7 @@ nm_dns_manager_remove_ip6_config (NMDnsManager *mgr, NMIP6Config *config) if (!priv->updates_queue && !update_dns (mgr, FALSE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } @@ -988,8 +983,7 @@ nm_dns_manager_set_hostname (NMDnsManager *mgr, if (!priv->updates_queue && !update_dns (mgr, FALSE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } } @@ -1044,8 +1038,7 @@ nm_dns_manager_end_updates (NMDnsManager *mgr, const char *func) nm_log_dbg (LOGD_DNS, "(%s): committing DNS changes (%d)", func, priv->updates_queue); if (!update_dns (mgr, FALSE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } @@ -1146,8 +1139,7 @@ dispose (GObject *object) */ if (priv->dns_touched && !update_dns (self, TRUE, &error)) { nm_log_warn (LOGD_DNS, "could not commit DNS changes on shutdown: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); priv->dns_touched = FALSE; } diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index e85b2a097a..19aa8d2eb3 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -188,8 +188,7 @@ nm_dns_plugin_child_spawn (NMDnsPlugin *self, 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 ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + priv->progname, error->code, error->message); g_clear_error (&error); } diff --git a/src/main.c b/src/main.c index 0ba65b0b8a..5336f4b74d 100644 --- a/src/main.c +++ b/src/main.c @@ -499,8 +499,7 @@ main (int argc, char *argv[]) config = nm_config_new (&error); if (config == NULL) { fprintf (stderr, _("Failed to read configuration: (%d) %s\n"), - error ? error->code : -1, - (error && error->message) ? error->message : _("unknown")); + error->code, error->message); exit (1); } @@ -527,8 +526,7 @@ main (int argc, char *argv[]) if (!parse_state_file (state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &wimax_enabled, &error)) { fprintf (stderr, _("State file %s parsing failed: (%d) %s\n"), state_file, - error ? error->code : -1, - (error && error->message) ? error->message : _("unknown")); + error->code, error->message); /* Not a hard failure */ } g_clear_error (&error); @@ -609,8 +607,7 @@ main (int argc, char *argv[]) settings = nm_settings_new (&error); if (!settings) { - nm_log_err (LOGD_CORE, "failed to initialize settings storage: %s", - error && error->message ? error->message : "(unknown)"); + nm_log_err (LOGD_CORE, "failed to initialize settings storage: %s", error->message); goto done; } @@ -622,8 +619,7 @@ main (int argc, char *argv[]) wimax_enabled, &error); if (manager == NULL) { - nm_log_err (LOGD_CORE, "failed to initialize the network manager: %s", - error && error->message ? error->message : "(unknown)"); + nm_log_err (LOGD_CORE, "failed to initialize the network manager: %s", error->message); goto done; } diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 9f9ee0f940..11927afae8 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -246,8 +246,7 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared) if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, share_child_setup, NULL, NULL, NULL, &status, &error)) { nm_log_warn (LOGD_SHARING, "Error executing command: (%d) %s", - error ? error->code : -1, - (error && error->message) ? error->message : "(unknown)"); + error->code, 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-manager-auth.c b/src/nm-manager-auth.c index 7f8b313097..ca58df1df6 100644 --- a/src/nm-manager-auth.c +++ b/src/nm-manager-auth.c @@ -540,7 +540,7 @@ nm_auth_uid_in_acl (NMConnection *connection, if (out_error_desc) { *out_error_desc = g_strdup_printf ("No session found for uid %lu (%s)", uid, - local && local->message ? local->message : "unknown"); + local->message); } g_clear_error (&local); return FALSE; diff --git a/src/nm-manager.c b/src/nm-manager.c index b806809d80..e0cd7de006 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1604,7 +1604,7 @@ get_existing_connection (NMManager *manager, NMDevice *device) nm_log_warn (LOGD_SETTINGS, "(%s) Couldn't save generated connection '%s': %s", nm_device_get_iface (device), nm_connection_get_id (connection), - (error && error->message) ? error->message : "(unknown)"); + error->message); g_clear_error (&error); } g_object_unref (connection); @@ -1893,7 +1893,7 @@ load_device_factories (NMManager *self) if (!dir) { nm_log_warn (LOGD_HW, "Failed to open plugin directory %s: %s", NMPLUGINDIR, - (error && error->message) ? error->message : "(unknown)"); + error->message); g_clear_error (&error); return; } @@ -1954,7 +1954,7 @@ load_device_factories (NMManager *self) factory = create_func (&error); if (!factory) { nm_log_warn (LOGD_HW, "(%s): failed to initialize device factory: %s", - item, error ? error->message : "unknown"); + item, error->message); g_clear_error (&error); g_module_close (plugin); continue; @@ -2015,8 +2015,7 @@ platform_link_added (NMManager *self, if (error) { nm_log_warn (LOGD_HW, "%s: factory failed to create device: (%d) %s", plink->udi, - error ? error->code : -1, - error ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); return; } @@ -3734,8 +3733,8 @@ _internal_enable (NMManager *self, gboolean enable) /* Not a hard error */ nm_log_warn (LOGD_SUSPEND, "writing to state file %s failed: (%d) %s.", priv->state_file, - err ? err->code : -1, - (err && err->message) ? err->message : "unknown"); + err->code, + err->message); } } @@ -4498,8 +4497,7 @@ manager_radio_user_toggled (NMManager *self, &error)) { nm_log_warn (LOGD_CORE, "writing to state file %s failed: (%d) %s.", priv->state_file, - error ? error->code : -1, - (error && error->message) ? error->message : "unknown"); + error->code, error->message); g_clear_error (&error); } } diff --git a/src/nm-policy.c b/src/nm-policy.c index 15d4fa6ee2..b1a6275650 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1023,8 +1023,7 @@ auto_activate_device (gpointer user_data) &error)) { nm_log_info (LOGD_DEVICE, "Connection '%s' auto-activation failed: (%d) %s", nm_connection_get_id (best_connection), - error ? error->code : -1, - error ? error->message : "(none)"); + error->code, error->message); g_error_free (error); } g_object_unref (subject); @@ -1401,8 +1400,7 @@ activate_secondary_connections (NMPolicy *policy, else { nm_log_warn (LOGD_DEVICE, "Secondary connection '%s (%s)' auto-activation failed: (%d) %s", nm_connection_get_id (NM_CONNECTION (settings_con)), sec_uuid, - error ? error->code : 0, - (error && error->message) ? error->message : "unknown"); + error->code, error->message); g_clear_error (&error); success = FALSE; break; @@ -1989,8 +1987,7 @@ _deactivate_if_active (NMManager *manager, NMConnection *connection) &error)) { nm_log_warn (LOGD_DEVICE, "Connection '%s' disappeared, but error deactivating it: (%d) %s", nm_connection_get_id (connection), - error ? error->code : -1, - error ? error->message : "(unknown)"); + 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 e6ee86f7a4..94393233fc 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -276,9 +276,7 @@ get_credentials (char *username, char *password) G_TYPE_STRING, &my_password, G_TYPE_INVALID)) { g_warning ("nm-ppp-plugin: (%s): could not get secrets: (%d) %s", - __func__, - err ? err->code : -1, - err->message ? err->message : "(unknown)"); + __func__, err->code, err->message); g_error_free (err); return -1; } @@ -334,9 +332,7 @@ plugin_init (void) bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err); if (!bus) { g_warning ("nm-pppd-plugin: (%s): couldn't connect to system bus: (%d) %s", - __func__, - err ? err->code : -1, - err && err->message ? err->message : "(unknown)"); + __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 ae9306929e..08c7be2301 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -301,7 +301,7 @@ impl_agent_manager_register_with_capabilities (NMAgentManager *self, &local)) { error = g_error_new_literal (NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_SESSION_NOT_FOUND, - local && local->message ? local->message : "Session not found"); + local->message); goto done; } @@ -813,8 +813,7 @@ get_done_cb (NMSecretAgent *agent, nm_log_dbg (LOGD_AGENTS, "(%s) agent failed secrets request %p/%s/%s: (%d) %s", nm_secret_agent_get_description (agent), req, parent->detail, req->setting_name, - error ? error->code : -1, - (error && error->message) ? error->message : "(unknown)"); + error->code, error->message); if (dbus_g_error_has_name (error, NM_DBUS_INTERFACE_SECRET_AGENT ".UserCanceled")) { error = g_error_new_literal (NM_AGENT_MANAGER_ERROR, @@ -950,7 +949,7 @@ get_agent_modify_auth_cb (NMAuthChain *chain, nm_log_dbg (LOGD_AGENTS, "(%s) agent %p/%s/%s MODIFY check error: (%d) %s", nm_secret_agent_get_description (parent->current), req, parent->detail, req->setting_name, - error->code, error->message ? error->message : "(unknown)"); + error->code, error->message); /* Try the next agent */ request_next_agent (parent); } else { @@ -1250,8 +1249,7 @@ save_done_cb (NMSecretAgent *agent, nm_log_dbg (LOGD_AGENTS, "(%s) agent failed save secrets request %p/%s: (%d) %s", nm_secret_agent_get_description (agent), req, parent->detail, - error ? error->code : -1, - (error && error->message) ? error->message : "(unknown)"); + error->code, error->message); /* Try the next agent */ request_next_agent (parent); return; @@ -1341,8 +1339,7 @@ delete_done_cb (NMSecretAgent *agent, if (error) { nm_log_dbg (LOGD_AGENTS, "(%s) agent failed delete secrets request %p/%s: (%d) %s", nm_secret_agent_get_description (agent), req, req->detail, - error ? error->code : -1, - (error && error->message) ? error->message : "(unknown)"); + error->code, error->message); } else { nm_log_dbg (LOGD_AGENTS, "(%s) agent deleted secrets for request %p/%s", nm_secret_agent_get_description (agent), req, req->detail); diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index bf0bba1297..ff675e0459 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -323,8 +323,7 @@ cancel_done (DBusGProxy *proxy, DBusGProxyCall *call_id, void *user_data) if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { nm_log_dbg (LOGD_AGENTS, "(%s): agent failed to cancel secrets: (%d) %s", (const char *) user_data, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } } diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 00f5a15f13..2014cec713 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -703,7 +703,7 @@ new_secrets_commit_cb (NMSettingsConnection *connection, { if (error) { nm_log_warn (LOGD_SETTINGS, "Error saving new secrets to backing storage: (%d) %s", - error->code, error->message ? error->message : "(unknown)"); + error->code, error->message); } } @@ -735,7 +735,7 @@ agent_secrets_done_cb (NMAgentManager *manager, setting_name, call_id, error->code, - error->message ? error->message : "(unknown)"); + error->message); callback (self, call_id, NULL, setting_name, error, callback_data); return; @@ -846,16 +846,16 @@ agent_secrets_done_cb (NMAgentManager *manager, nm_connection_get_uuid (NM_CONNECTION (self)), setting_name, call_id, - local ? local->code : -1, - (local && local->message) ? local->message : "(unknown)"); + local->code, + local->message); } } else { nm_log_dbg (LOGD_SETTINGS, "(%s/%s:%u) failed to update with existing secrets: (%d) %s", nm_connection_get_uuid (NM_CONNECTION (self)), setting_name, call_id, - local ? local->code : -1, - (local && local->message) ? local->message : "(unknown)"); + local->code, + local->message); } callback (self, call_id, agent_username, setting_name, local, callback_data); @@ -991,7 +991,7 @@ pk_auth_cb (NMAuthChain *chain, error = g_error_new (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_GENERAL, "Error checking authorization: %s", - chain_error->message ? chain_error->message : "(unknown)"); + chain_error->message); } else if (result != NM_AUTH_CALL_RESULT_YES) { error = g_error_new_literal (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_PERMISSION_DENIED, diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 6b34bf89e8..aace9b68cf 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -949,7 +949,7 @@ nm_settings_add_connection (NMSettings *self, nm_log_dbg (LOGD_SETTINGS, "Failed to add %s/'%s': %s", nm_connection_get_uuid (connection), nm_connection_get_id (connection), - add_error ? add_error->message : "(unknown)"); + add_error->message); g_clear_error (&add_error); } @@ -1037,7 +1037,7 @@ pk_add_cb (NMAuthChain *chain, error = g_error_new (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_GENERAL, "Error checking authorization: %s", - chain_error->message ? chain_error->message : "(unknown)"); + chain_error->message); } else if (result != NM_AUTH_CALL_RESULT_YES) { error = g_error_new_literal (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_PERMISSION_DENIED, @@ -1120,7 +1120,7 @@ nm_settings_add_connection_dbus (NMSettings *self, error = g_error_new (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "The connection was invalid: %s", - tmp_error ? tmp_error->message : "(unknown)"); + tmp_error->message); g_error_free (tmp_error); goto done; } @@ -1362,7 +1362,7 @@ pk_hostname_cb (NMAuthChain *chain, error = g_error_new (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_GENERAL, "Error checking authorization: %s", - chain_error->message ? chain_error->message : "(unknown)"); + chain_error->message); } else if (result != NM_AUTH_CALL_RESULT_YES) { error = g_error_new_literal (NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_PERMISSION_DENIED, @@ -1648,7 +1648,7 @@ nm_settings_device_added (NMSettings *self, NMDevice *device) if (!added) { nm_log_warn (LOGD_SETTINGS, "(%s) couldn't create default wired connection: %s", nm_device_get_iface (device), - (error && error->message) ? error->message : "(unknown)"); + error->message); g_clear_error (&error); return; } diff --git a/src/settings/plugins/example/plugin.c b/src/settings/plugins/example/plugin.c index eea9494608..f0e52d95fb 100644 --- a/src/settings/plugins/example/plugin.c +++ b/src/settings/plugins/example/plugin.c @@ -159,8 +159,7 @@ read_connections (NMSystemConfigInterface *config) if (!dir) { nm_log_warn (LOGD_SETTINGS, "Cannot read directory '%s': (%d) %s", EXAMPLE_DIR, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); return; } @@ -179,10 +178,9 @@ read_connections (NMSystemConfigInterface *config) nm_log_info (LOGD_SETTINGS, " read connection '%s'", nm_connection_get_id (NM_CONNECTION (connection))); } else { - nm_log_info (LOGD_SETTINGS, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + nm_log_info (LOGD_SETTINGS, " error: %s", error->message); + g_clear_error (&error); } - g_clear_error (&error); g_free (full_path); } g_dir_close (dir); @@ -200,9 +198,9 @@ update_connection_settings_commit_cb (NMSettingsConnection *orig, GError *error, if (error) { nm_log_warn (LOGD_SETTINGS, "%s: '%s' / '%s' invalid: %d", __func__, - error ? g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)) : "(none)", - (error && error->message) ? error->message : "(none)", - error ? error->code : -1); + g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)), + error->message, + error->code); g_clear_error (&error); nm_settings_connection_signal_remove (orig); @@ -319,11 +317,10 @@ dir_changed (GFileMonitor *monitor, * becomes valid again later we'll get another change * notification, we'll re-read it, and we'll treat it as new. */ - nm_log_info (LOGD_SETTINGS, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + nm_log_info (LOGD_SETTINGS, " error: %s", error->message); remove_connection (SC_PLUGIN_EXAMPLE (config), connection, full_path); + g_clear_error (&error); } - g_clear_error (&error); } else { nm_log_info (LOGD_SETTINGS, "updating %s", full_path); @@ -370,7 +367,7 @@ dir_changed (GFileMonitor *monitor, g_signal_emit_by_name (config, NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED, connection); } } else { - nm_log_info (LOGD_SETTINGS, " error: %s", (error && error->message) ? error->message : "(unknown)"); + nm_log_info (LOGD_SETTINGS, " error: %s", error->message); g_clear_error (&error); } } diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 8a3f328c8e..c488cf319d 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -289,7 +289,7 @@ connection_new_or_changed (SCPluginIfcfg *self, if (!new) { /* errors reading connection; remove it */ if (!ignore_error) - nm_log_warn (LOGD_SETTINGS, " %s", (error && error->message) ? error->message : "(unknown)"); + nm_log_warn (LOGD_SETTINGS, " %s", error->message); g_clear_error (&error); nm_log_info (LOGD_SETTINGS, "removed %s.", path); diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 0e5be5d6b2..be5a69bf85 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -6819,7 +6819,7 @@ test_write_wired_static (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-static-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -6828,7 +6828,7 @@ test_write_wired_static (void) &error); ASSERT (success == TRUE, "wired-static-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-static-write", "didn't get ifcfg file path back after writing connection"); @@ -6933,7 +6933,7 @@ test_write_wired_dhcp (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-dhcp-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* IP6 setting */ s_ip6 = (NMSettingIP6Config *) nm_setting_ip6_config_new (); @@ -6951,7 +6951,7 @@ test_write_wired_dhcp (void) &error); ASSERT (success == TRUE, "wired-dhcp-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-dhcp-write", "didn't get ifcfg file path back after writing connection"); @@ -7181,7 +7181,7 @@ test_write_wired_static_ip6_only (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-static-ip6-only-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -7190,7 +7190,7 @@ test_write_wired_static_ip6_only (void) &error); ASSERT (success == TRUE, "wired-static-ip6-only-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-static-ip6-only-write", "didn't get ifcfg file path back after writing connection"); @@ -7495,7 +7495,7 @@ test_read_write_static_routes_legacy (void) &error); ASSERT (success == TRUE, "read-write-static-routes-legacy-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "read-write-static-routes-legacy-write", "didn't get ifcfg file path back after writing connection"); @@ -7661,7 +7661,7 @@ test_write_wired_static_routes (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-static-routes-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -7670,7 +7670,7 @@ test_write_wired_static_routes (void) &error); ASSERT (success == TRUE, "wired-static-routes-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-static-routes-write", "didn't get ifcfg file path back after writing connection"); @@ -7789,11 +7789,11 @@ test_write_wired_dhcp_8021x_peap_mschapv2 (void) &error); ASSERT (success == TRUE, "wired-dhcp-8021x-peap-mschapv2write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-dhcp-8021x-peap-mschapv2write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -7802,7 +7802,7 @@ test_write_wired_dhcp_8021x_peap_mschapv2 (void) &error); ASSERT (success == TRUE, "wired-dhcp-8021x-peap-mschapv2write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-dhcp-8021x-peap-mschapv2write", "didn't get ifcfg file path back after writing connection"); @@ -8158,7 +8158,7 @@ test_write_wired_aliases (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-aliases-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Create some pre-existing alias files, to make sure they get overwritten / deleted. */ ifcfg = svCreateFile (TEST_SCRATCH_ALIAS_BASE ":2"); @@ -8184,7 +8184,7 @@ test_write_wired_aliases (void) &error); ASSERT (success == TRUE, "wired-aliases-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-aliases-write", "didn't get ifcfg file path back after writing connection"); @@ -8368,7 +8368,7 @@ test_write_wifi_open (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-open-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -8377,7 +8377,7 @@ test_write_wifi_open (void) &error); ASSERT (success == TRUE, "wifi-open-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-open-write", "didn't get ifcfg file path back after writing connection"); @@ -8500,7 +8500,7 @@ test_write_wifi_open_hex_ssid (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-open-hex-ssid-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -8509,7 +8509,7 @@ test_write_wifi_open_hex_ssid (void) &error); ASSERT (success == TRUE, "wifi-open-hex-ssid-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-open-hex-ssid-write", "didn't get ifcfg file path back after writing connection"); @@ -8631,7 +8631,7 @@ test_write_wifi_wep (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wep-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -8640,7 +8640,7 @@ test_write_wifi_wep (void) &error); ASSERT (success == TRUE, "wifi-wep-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wep-write", "didn't get ifcfg file path back after writing connection"); @@ -8782,7 +8782,7 @@ test_write_wifi_wep_adhoc (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wep-adhoc-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -8791,7 +8791,7 @@ test_write_wifi_wep_adhoc (void) &error); ASSERT (success == TRUE, "wifi-wep-adhoc-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wep-adhoc-write", "didn't get ifcfg file path back after writing connection"); @@ -8923,7 +8923,7 @@ test_write_wifi_wep_passphrase (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wep-passphrase-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -8932,7 +8932,7 @@ test_write_wifi_wep_passphrase (void) &error); ASSERT (success == TRUE, "wifi-wep-passphrase-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wep-passphrase-write", "didn't get ifcfg file path back after writing connection"); @@ -9066,7 +9066,7 @@ test_write_wifi_wep_40_ascii (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wep-40-ascii-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -9075,7 +9075,7 @@ test_write_wifi_wep_40_ascii (void) &error); ASSERT (success == TRUE, "wifi-wep-40-ascii-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wep-40-ascii-write", "didn't get ifcfg file path back after writing connection"); @@ -9209,7 +9209,7 @@ test_write_wifi_wep_104_ascii (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wep-104-ascii-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -9218,7 +9218,7 @@ test_write_wifi_wep_104_ascii (void) &error); ASSERT (success == TRUE, "wifi-wep-104-ascii-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wep-104-ascii-write", "didn't get ifcfg file path back after writing connection"); @@ -9349,7 +9349,7 @@ test_write_wifi_leap (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-leap-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -9358,7 +9358,7 @@ test_write_wifi_leap (void) &error); ASSERT (success == TRUE, "wifi-leap-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-leap-write", "didn't get ifcfg file path back after writing connection"); @@ -9644,7 +9644,7 @@ test_write_wifi_wpa_psk (const char *name, ASSERT (nm_connection_verify (connection, &error) == TRUE, test_name, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -9653,7 +9653,7 @@ test_write_wifi_wpa_psk (const char *name, &error); ASSERT (success == TRUE, test_name, "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, test_name, "didn't get ifcfg file path back after writing connection"); @@ -9795,7 +9795,7 @@ test_write_wifi_wpa_psk_adhoc (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wpa-psk-adhoc-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -9804,7 +9804,7 @@ test_write_wifi_wpa_psk_adhoc (void) &error); ASSERT (success == TRUE, "wifi-wpa-psk-adhoc-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wpa-psk-adhoc-write", "didn't get ifcfg file path back after writing connection"); @@ -9961,7 +9961,7 @@ test_write_wifi_wpa_eap_tls (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wpa-eap-tls-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -9970,7 +9970,7 @@ test_write_wifi_wpa_eap_tls (void) &error); ASSERT (success == TRUE, "wifi-wpa-eap-tls-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wpa-eap-tls-write", "didn't get ifcfg file path back after writing connection"); @@ -10145,7 +10145,7 @@ test_write_wifi_wpa_eap_ttls_tls (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wpa-eap-ttls-tls-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -10154,7 +10154,7 @@ test_write_wifi_wpa_eap_ttls_tls (void) &error); ASSERT (success == TRUE, "wifi-wpa-eap-ttls-tls-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wpa-eap-ttls-tls-write", "didn't get ifcfg file path back after writing connection"); @@ -10301,7 +10301,7 @@ test_write_wifi_wpa_eap_ttls_mschapv2 (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-wpa-eap-ttls-mschapv2-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -10310,7 +10310,7 @@ test_write_wifi_wpa_eap_ttls_mschapv2 (void) &error); ASSERT (success == TRUE, "wifi-wpa-eap-ttls-mschapv2-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wifi-wpa-eap-ttls-mschapv2-write", "didn't get ifcfg file path back after writing connection"); @@ -11376,7 +11376,7 @@ test_write_wired_qeth_dhcp (void) /* Verify */ ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-qeth-dhcp-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -11385,7 +11385,7 @@ test_write_wired_qeth_dhcp (void) &error); ASSERT (success == TRUE, "wired-qeth-dhcp-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "wired-qeth-dhcp-write", "didn't get ifcfg file path back after writing connection"); @@ -11625,7 +11625,7 @@ test_write_permissions (void) /* Verify */ ASSERT (nm_connection_verify (connection, &error) == TRUE, "permissions-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -11634,7 +11634,7 @@ test_write_permissions (void) &error); ASSERT (success == TRUE, "permissions-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "permissions-write", "didn't get ifcfg file path back after writing connection"); @@ -11875,7 +11875,7 @@ test_write_wired_pppoe (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wired-pppoe-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -11937,7 +11937,7 @@ test_write_vpn (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "vpn-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -12019,7 +12019,7 @@ test_write_mobile_broadband (gboolean gsm) ASSERT (nm_connection_verify (connection, &error) == TRUE, "mobile-broadband-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -12763,7 +12763,7 @@ test_write_ethernet_missing_ipv6 (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "ethernet-missing-ipv6", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -12772,7 +12772,7 @@ test_write_ethernet_missing_ipv6 (void) &error); ASSERT (success == TRUE, "ethernet-missing-ipv6", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "ethernet-missing-ipv6", "didn't get ifcfg file path back after writing connection"); @@ -12954,7 +12954,7 @@ test_write_bond_main (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "bond-main-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -12963,7 +12963,7 @@ test_write_bond_main (void) &error); ASSERT (success == TRUE, "bond-main-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "bond-main-write", "didn't get ifcfg file path back after writing connection"); @@ -13108,7 +13108,7 @@ test_write_bond_slave (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "bond-slave-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -13117,7 +13117,7 @@ test_write_bond_slave (void) &error); ASSERT (success == TRUE, "bond-slave-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "bond-slave-write", "didn't get ifcfg file path back after writing connection"); @@ -13322,7 +13322,7 @@ test_write_infiniband (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "infiniband-write", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -13331,7 +13331,7 @@ test_write_infiniband (void) &error); ASSERT (success == TRUE, "infiniband-write", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "infiniband-write", "didn't get ifcfg file path back after writing connection"); @@ -13479,7 +13479,7 @@ test_write_bond_slave_ib (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "bond-slave-write-ib", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); /* Save the ifcfg */ success = writer_new_connection (connection, @@ -13488,7 +13488,7 @@ test_write_bond_slave_ib (void) &error); ASSERT (success == TRUE, "bond-slave-write-ib", "failed to write connection to disk: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); ASSERT (testfile != NULL, "bond-slave-write-ib", "didn't get ifcfg file path back after writing connection"); diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index f583366cf8..815685c472 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -364,7 +364,7 @@ write_object (NMSetting8021x *s_8021x, g_set_error (error, IFCFG_PLUGIN_ERROR, 0, "Could not write certificate/key for %s / %s: %s", NM_SETTING_802_1X_SETTING_NAME, objtype->setting_key, - (write_error && write_error->message) ? write_error->message : "(unknown)"); + write_error->message); g_clear_error (&write_error); } g_free (new_file); @@ -2122,9 +2122,11 @@ write_ip4_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) } svCloseFile (routefile); } else { - write_route_file_legacy (route_path, s_ip4, error); + gboolean wrote_legacy_file; + + wrote_legacy_file = write_route_file_legacy (route_path, s_ip4, error); g_free (route_path); - if (error && *error) + if (!wrote_legacy_file) goto out; } @@ -2306,6 +2308,7 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) const struct in6_addr *ip; GString *ip_str1, *ip_str2, *ip_ptr; char *route6_path; + gboolean wrote_route6_file; s_ip6 = nm_connection_get_setting_ip6_config (connection); if (!s_ip6) { @@ -2471,9 +2474,9 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) "Could not get route6 file path for '%s'", ifcfg->fileName); goto error; } - write_route6_file (route6_path, s_ip6, error); + wrote_route6_file = write_route6_file (route6_path, s_ip6, error); g_free (route6_path); - if (error && *error) + if (!wrote_route6_file) goto error; return TRUE; diff --git a/src/settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c index c320ed5f8f..e47811b6bb 100644 --- a/src/settings/plugins/ifnet/tests/test_all.c +++ b/src/settings/plugins/ifnet/tests/test_all.c @@ -299,31 +299,31 @@ test_new_connection () g_test_assert_expected_messages (); ASSERT (connection != NULL, "new connection", "new connection failed: %s", - error ? error->message : "None"); + error->message); g_object_unref (connection); connection = ifnet_update_connection_from_config_block ("qiaomuf", NULL, &error); ASSERT (connection != NULL, "new connection", "new connection failed: %s", - error ? error->message : "NONE"); + error->message); g_object_unref (connection); connection = ifnet_update_connection_from_config_block ("myxjtu2", NULL, &error); ASSERT (connection != NULL, "new connection", "new connection failed: %s", - error ? error->message : "NONE"); + error->message); g_object_unref (connection); connection = ifnet_update_connection_from_config_block ("eth9", NULL, &error); ASSERT (connection != NULL, "new connection", "new connection(eth9) failed: %s", - error ? error->message : "NONE"); + error->message); g_object_unref (connection); connection = ifnet_update_connection_from_config_block ("eth10", NULL, &error); ASSERT (connection != NULL, "new connection", "new connection(eth10) failed: %s", - error ? error->message : "NONE"); + error->message); g_object_unref (connection); } @@ -351,7 +351,7 @@ test_update_connection (const char *basepath) connection = ifnet_update_connection_from_config_block ("eth0", basepath, &error); ASSERT (connection != NULL, "get connection", "get connection failed: %s", - error ? error->message : "None"); + error->message); success = ifnet_update_parsers_by_connection (connection, "eth0", NET_GEN_NAME, @@ -365,7 +365,7 @@ test_update_connection (const char *basepath) connection = ifnet_update_connection_from_config_block ("0xab3ace", basepath, &error); ASSERT (connection != NULL, "get connection", "get connection failed: %s", - error ? error->message : "None"); + error->message); success = ifnet_update_parsers_by_connection (connection, "0xab3ace", NET_GEN_NAME, @@ -418,7 +418,7 @@ test_delete_connection () connection = ifnet_update_connection_from_config_block ("eth7", NULL, &error); ASSERT (connection != NULL, "get connection", "get connection failed: %s", - error ? error->message : "None"); + error->message); ASSERT (ifnet_delete_connection_in_parsers ("eth7", NET_GEN_NAME, SUP_GEN_NAME, &backup), "delete connection", "delete connection failed: %s", "eth7"); kill_backup (&backup); @@ -427,7 +427,7 @@ test_delete_connection () connection = ifnet_update_connection_from_config_block ("qiaomuf", NULL, &error); ASSERT (connection != NULL, "get connection", "get connection failed: %s", - error ? error->message : "None"); + error->message); ASSERT (ifnet_delete_connection_in_parsers ("qiaomuf", NET_GEN_NAME, SUP_GEN_NAME, &backup), "delete connection", "delete connection failed: %s", "qiaomuf"); kill_backup (&backup); diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index db9fd27dd6..e30eab3c5e 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -97,8 +97,7 @@ constructor (GType type, nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: (%d) %s", __FILE__, __LINE__, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); goto err; } diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index 10c8397180..3e406519da 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -111,7 +111,7 @@ update_connection (SCPluginKeyfile *self, if (!tmp) { /* Error; remove the connection */ nm_log_warn (LOGD_SETTINGS, " error in connection %s: %s", name, - (error && error->message) ? error->message : "(unknown)"); + error->message); g_clear_error (&error); remove_connection (self, connection); return; @@ -166,7 +166,7 @@ new_connection (SCPluginKeyfile *self, tmp = nm_keyfile_connection_new (NULL, name, &error); if (!tmp) { nm_log_warn (LOGD_SETTINGS, " error in connection %s: %s", name, - (error && error->message) ? error->message : "(unknown)"); + error->message); g_clear_error (&error); return; } @@ -320,8 +320,7 @@ read_connections (NMSystemConfigInterface *config) if (!dir) { nm_log_warn (LOGD_SETTINGS, "Cannot read directory '%s': (%d) %s", KEYFILE_DIR, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); return; } diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 83090f37aa..c6efba8c0c 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -1311,8 +1311,10 @@ nm_keyfile_plugin_connection_from_file (const char *filename, GError **error) if (!nm_connection_verify (connection, &verify_error)) { g_set_error (error, KEYFILE_PLUGIN_ERROR, 0, "invalid or missing connection property '%s/%s'", - verify_error ? g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain)) : "(unknown)", - (verify_error && verify_error->message) ? verify_error->message : "(unknown)"); + g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain)), + verify_error->message); + g_warning ("Connection failed to verify: %s", + g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain))); g_clear_error (&verify_error); g_object_unref (connection); connection = NULL; diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index cc57c1c393..46e8dc4ca9 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -652,7 +652,7 @@ test_write_wired_connection (void) success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, "connection-write", "failed to write keyfile: %s", - error ? error->message : "(none)"); + error->message); ASSERT (testfile != NULL, "connection-write", "didn't get keyfile name back after writing connection"); @@ -856,7 +856,7 @@ test_write_ip6_wired_connection (void) success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, "connection-write", "failed to write keyfile: %s", - error ? error->message : "(none)"); + error->message); ASSERT (testfile != NULL, "connection-write", "didn't get keyfile name back after writing connection"); @@ -1240,7 +1240,7 @@ test_write_wireless_connection (void) success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, "connection-write", "failed to write keyfile: %s", - error ? error->message : "(none)"); + error->message); ASSERT (testfile != NULL, "connection-write", "didn't get keyfile name back after writing connection"); @@ -1356,7 +1356,7 @@ test_write_string_ssid (void) success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, "connection-write", "failed to write keyfile: %s", - error ? error->message : "(none)"); + error->message); ASSERT (testfile != NULL, "connection-write", "didn't get keyfile name back after writing connection"); @@ -1989,7 +1989,7 @@ test_write_bt_dun_connection (void) success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, "connection-write", "failed to write keyfile: %s", - error ? error->message : "(none)"); + error->message); ASSERT (testfile != NULL, "connection-write", "didn't get keyfile name back after writing connection"); @@ -2224,7 +2224,7 @@ test_write_gsm_connection (void) success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); ASSERT (success == TRUE, "connection-write", "failed to write keyfile: %s", - error ? error->message : "(none)"); + error->message); ASSERT (testfile != NULL, "connection-write", "didn't get keyfile name back after writing connection"); diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 5c091673b2..5cc70f8c0f 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -528,7 +528,7 @@ iface_get_props_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_da g_hash_table_destroy (props); } else { nm_log_warn (LOGD_SUPPLICANT, "could not get interface properties: %s.", - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); } iface_check_ready (self); @@ -938,7 +938,7 @@ remove_network_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_dat if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { nm_log_dbg (LOGD_SUPPLICANT, "Couldn't remove network from supplicant interface: %s.", - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); } } @@ -950,7 +950,7 @@ disconnect_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { nm_log_warn (LOGD_SUPPLICANT, "Couldn't disconnect supplicant interface: %s.", - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); } } diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index c50691d9f5..d833cd0e15 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -147,8 +147,7 @@ get_capabilities_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_ DBUS_TYPE_G_MAP_OF_VARIANT, &props, G_TYPE_INVALID)) { nm_log_warn (LOGD_CORE, "Unexpected error requesting supplicant properties: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); return; } diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index ce884a8dd5..ae9c1f754b 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -169,7 +169,7 @@ test_wifi_open (void) ASSERT (nm_connection_verify (connection, &error) == TRUE, "wifi-open", "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); config = nm_supplicant_config_new (); @@ -280,7 +280,7 @@ test_wifi_wep_key (const char *detail, ASSERT (nm_connection_verify (connection, &error) == TRUE, detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); config = nm_supplicant_config_new (); @@ -429,7 +429,7 @@ test_wifi_wpa_psk (const char *detail, ASSERT (nm_connection_verify (connection, &error) == TRUE, detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + error->message); config = nm_supplicant_config_new (); diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 5550d4d6c6..27ad6bc757 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -153,8 +153,7 @@ try_add_service (NMVPNManager *self, const char *namefile) } else { nm_log_warn (LOGD_VPN, "failed to load VPN service file %s: (%d) %s", namefile, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->code, error->message); g_clear_error (&error); } } diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c index 824543fa41..8ef37fa6ad 100644 --- a/src/vpn-manager/nm-vpn-service.c +++ b/src/vpn-manager/nm-vpn-service.c @@ -215,12 +215,11 @@ nm_vpn_service_daemon_exec (NMVPNService *service, GError **error) } else { nm_log_warn (LOGD_VPN, "VPN service '%s': could not launch the VPN service. error: (%d) %s.", priv->name, - spawn_error ? spawn_error->code : -1, - spawn_error && spawn_error->message ? spawn_error->message : "(unknown)"); + spawn_error->code, spawn_error->message); g_set_error (error, NM_VPN_MANAGER_ERROR, NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, - "%s", spawn_error ? spawn_error->message : "unknown g_spawn_async() error"); + "%s", spawn_error->message); nm_vpn_service_stop_connections (service, FALSE, NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED); if (spawn_error) diff --git a/tui/vpn-helpers.c b/tui/vpn-helpers.c index f4e32837a8..9e3a0ed69e 100644 --- a/tui/vpn-helpers.c +++ b/tui/vpn-helpers.c @@ -216,7 +216,7 @@ import_vpn_from_file_cb (GtkWidget *dialog, gint response, gpointer user_data) _("Cannot import VPN connection")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), _("The file '%s' could not be read or does not contain recognized VPN connection information\n\nError: %s."), - bname, error ? error->message : "unknown error"); + bname, error->message); g_free (bname); g_signal_connect (err_dialog, "delete-event", G_CALLBACK (gtk_widget_destroy), NULL); g_signal_connect (err_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -341,7 +341,7 @@ done: _("Cannot export VPN connection")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), _("The VPN connection '%s' could not be exported to %s.\n\nError: %s."), - id ? id : "(unknown)", bname, error ? error->message : "unknown error"); + id ? id : "(unknown)", bname, error->message); g_free (bname); g_signal_connect (err_dialog, "delete-event", G_CALLBACK (gtk_widget_destroy), NULL); g_signal_connect (err_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); |