diff options
Diffstat (limited to 'libnm-core/nm-errors.c')
| -rw-r--r-- | libnm-core/nm-errors.c | 76 |
1 files changed, 33 insertions, 43 deletions
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c index d2c8cbd99f..045c88fd0b 100644 --- a/libnm-core/nm-errors.c +++ b/libnm-core/nm-errors.c @@ -10,57 +10,47 @@ #include "nm-vpn-dbus-interface.h" #include "nm-core-internal.h" -NM_CACHED_QUARK_FCN ("nm-agent-manager-error-quark", nm_agent_manager_error_quark); -NM_CACHED_QUARK_FCN ("nm-connection-error-quark", nm_connection_error_quark); -NM_CACHED_QUARK_FCN ("nm-crypto-error-quark", nm_crypto_error_quark); -NM_CACHED_QUARK_FCN ("nm-device-error-quark", nm_device_error_quark); -NM_CACHED_QUARK_FCN ("nm-manager-error-quark", nm_manager_error_quark); -NM_CACHED_QUARK_FCN ("nm-secret-agent-error-quark", nm_secret_agent_error_quark); -NM_CACHED_QUARK_FCN ("nm-settings-error-quark", nm_settings_error_quark); -NM_CACHED_QUARK_FCN ("nm-vpn-plugin-error-quark", nm_vpn_plugin_error_quark); +NM_CACHED_QUARK_FCN("nm-agent-manager-error-quark", nm_agent_manager_error_quark); +NM_CACHED_QUARK_FCN("nm-connection-error-quark", nm_connection_error_quark); +NM_CACHED_QUARK_FCN("nm-crypto-error-quark", nm_crypto_error_quark); +NM_CACHED_QUARK_FCN("nm-device-error-quark", nm_device_error_quark); +NM_CACHED_QUARK_FCN("nm-manager-error-quark", nm_manager_error_quark); +NM_CACHED_QUARK_FCN("nm-secret-agent-error-quark", nm_secret_agent_error_quark); +NM_CACHED_QUARK_FCN("nm-settings-error-quark", nm_settings_error_quark); +NM_CACHED_QUARK_FCN("nm-vpn-plugin-error-quark", nm_vpn_plugin_error_quark); static void -register_error_domain (GQuark domain, - const char *interface, - GType enum_type) +register_error_domain(GQuark domain, const char *interface, GType enum_type) { - nm_auto_unref_gtypeclass GEnumClass *enum_class = g_type_class_ref (enum_type); - guint i; + nm_auto_unref_gtypeclass GEnumClass *enum_class = g_type_class_ref(enum_type); + guint i; - for (i = 0; i < enum_class->n_values; i++) { - const GEnumValue *e = &enum_class->values[i]; - char error_name[200]; + for (i = 0; i < enum_class->n_values; i++) { + const GEnumValue *e = &enum_class->values[i]; + char error_name[200]; - nm_assert (e && e->value_nick && !strchr (e->value_nick, '-')); + nm_assert(e && e->value_nick && !strchr(e->value_nick, '-')); - nm_sprintf_buf (error_name, "%s.%s", interface, e->value_nick); - if (!g_dbus_error_register_error (domain, e->value, error_name)) - nm_assert_not_reached (); - } + nm_sprintf_buf(error_name, "%s.%s", interface, e->value_nick); + if (!g_dbus_error_register_error(domain, e->value, error_name)) + nm_assert_not_reached(); + } } void -_nm_dbus_errors_init (void) +_nm_dbus_errors_init(void) { - register_error_domain (NM_AGENT_MANAGER_ERROR, - NM_DBUS_INTERFACE_AGENT_MANAGER, - NM_TYPE_AGENT_MANAGER_ERROR); - register_error_domain (NM_CONNECTION_ERROR, - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - NM_TYPE_CONNECTION_ERROR); - register_error_domain (NM_DEVICE_ERROR, - NM_DBUS_INTERFACE_DEVICE, - NM_TYPE_DEVICE_ERROR); - register_error_domain (NM_MANAGER_ERROR, - NM_DBUS_INTERFACE, - NM_TYPE_MANAGER_ERROR); - register_error_domain (NM_SECRET_AGENT_ERROR, - NM_DBUS_INTERFACE_SECRET_AGENT, - NM_TYPE_SECRET_AGENT_ERROR); - register_error_domain (NM_SETTINGS_ERROR, - NM_DBUS_INTERFACE_SETTINGS, - NM_TYPE_SETTINGS_ERROR); - register_error_domain (NM_VPN_PLUGIN_ERROR, - NM_DBUS_VPN_ERROR_PREFIX, - NM_TYPE_VPN_PLUGIN_ERROR); + register_error_domain(NM_AGENT_MANAGER_ERROR, + NM_DBUS_INTERFACE_AGENT_MANAGER, + NM_TYPE_AGENT_MANAGER_ERROR); + register_error_domain(NM_CONNECTION_ERROR, + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + NM_TYPE_CONNECTION_ERROR); + register_error_domain(NM_DEVICE_ERROR, NM_DBUS_INTERFACE_DEVICE, NM_TYPE_DEVICE_ERROR); + register_error_domain(NM_MANAGER_ERROR, NM_DBUS_INTERFACE, NM_TYPE_MANAGER_ERROR); + register_error_domain(NM_SECRET_AGENT_ERROR, + NM_DBUS_INTERFACE_SECRET_AGENT, + NM_TYPE_SECRET_AGENT_ERROR); + register_error_domain(NM_SETTINGS_ERROR, NM_DBUS_INTERFACE_SETTINGS, NM_TYPE_SETTINGS_ERROR); + register_error_domain(NM_VPN_PLUGIN_ERROR, NM_DBUS_VPN_ERROR_PREFIX, NM_TYPE_VPN_PLUGIN_ERROR); } |