fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 14:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: refactor error variable in platform_link_added()

Browse source 
Free the error via gs_free_error and create separate instances.
This commit is contained in:
Thomas Haller 2016-04-04 19:42:04 +02:00
parent 1078935ccb
commit fe6940b692
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nm-manager.c
View file

@ -2005,7 +2005,6 @@ platform_link_added (NMManager *self,
{
NMDeviceFactory *factory;
NMDevice *device = NULL;
GError *error = NULL;
gboolean nm_plugin_missing = FALSE;
GSList *iter;
@ -2018,6 +2017,7 @@ platform_link_added (NMManager *self,
for (iter = NM_MANAGER_GET_PRIVATE (self)->devices; iter; iter = iter->next) {
NMDevice *candidate = iter->data;
gboolean compatible = TRUE;
gs_free_error GError *error = NULL;
if (strcmp (nm_device_get_iface (candidate), plink->name))
continue;
@ -2035,7 +2035,6 @@ platform_link_added (NMManager *self,
_LOGD (LOGD_DEVICE, "(%s): failed to realize from plink: '%s'",
plink->name, error->message);
g_clear_error (&error);
/* Try next unrealized device */
}
@ -2044,13 +2043,13 @@ platform_link_added (NMManager *self,
factory = nm_device_factory_manager_find_factory_for_link_type (plink->type);
if (factory) {
gboolean ignore = FALSE;
gs_free_error GError *error = NULL;
device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error);
if (!device) {
if (!ignore) {
_LOGW (LOGD_HW, "%s: factory failed to create device: %s",
plink->name, error->message);
g_clear_error (&error);
}
return;
}
@ -2074,6 +2073,8 @@ platform_link_added (NMManager *self,
}
if (device) {
gs_free_error GError *error = NULL;
if (nm_plugin_missing)
nm_device_set_nm_plugin_missing (device, TRUE);
if (nm_device_realize_start (device, plink, NULL, &error)) {
@ -2082,7 +2083,6 @@ platform_link_added (NMManager *self,
} else {
_LOGW (LOGD_DEVICE, "%s: failed to realize device: %s",
plink->name, error->message);
g_clear_error (&error);
}
g_object_unref (device);
}