fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 09:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: cleanup register_error_domain()

Browse source
This commit is contained in:
Thomas Haller 2019-05-14 16:27:27 +02:00
parent 9834c08b1a
commit a7c812f9f9
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libnm-core/nm-errors.c
View file

@ -39,21 +39,19 @@ register_error_domain (GQuark domain,
const char *interface,
GType enum_type)
{
GEnumClass *enum_class;
GEnumValue *e;
char *error_name;
int i;
nm_auto_unref_gtypeclass GEnumClass *enum_class = g_type_class_ref (enum_type);
guint i;
enum_class = g_type_class_ref (enum_type);
for (i = 0; i < enum_class->n_values; i++) {
e = &enum_class->values[i];
g_assert (strchr (e->value_nick, '-') == NULL);
error_name = g_strdup_printf ("%s.%s", interface, e->value_nick);
g_dbus_error_register_error (domain, e->value, error_name);
g_free (error_name);
}
const GEnumValue *e = &enum_class->values[i];
char error_name[200];
g_type_class_unref (enum_class);
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 ();
}
}
void
@ -77,9 +75,6 @@ _nm_dbus_errors_init (void)
register_error_domain (NM_SETTINGS_ERROR,
NM_DBUS_INTERFACE_SETTINGS,
NM_TYPE_SETTINGS_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);