colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: minor code cleanup in _new_from_nl_link()

Browse Source 
Add a code comment, rename goto-labels, reorder some
lines of code and have @lnk_data not being nm_auto_nmpobj.
This commit is contained in:
Thomas Haller
2015-11-20 11:54:47 +01:00
parent 0f6baeef35
commit eef83a199a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/platform/nm-linux-platform.c
View File

@@ -1231,7 +1231,7 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr
gboolean completed_from_cache_val = FALSE; gboolean completed_from_cache_val = FALSE;
gboolean *completed_from_cache = cache ? &completed_from_cache_val : NULL; gboolean *completed_from_cache = cache ? &completed_from_cache_val : NULL;
const NMPObject *link_cached = NULL; const NMPObject *link_cached = NULL;
nm_auto_nmpobj NMPObject *lnk_data = NULL; NMPObject *lnk_data = NULL;
if (!nlmsg_valid_hdr (nlh, sizeof (*ifi))) if (!nlmsg_valid_hdr (nlh, sizeof (*ifi)))
return NULL; return NULL;
@@ -1240,7 +1240,7 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr
obj = nmp_object_new_link (ifi->ifi_index); obj = nmp_object_new_link (ifi->ifi_index);
if (id_only) if (id_only)
goto done; goto id_only_handled;
err = nlmsg_parse (nlh, sizeof (*ifi), tb, IFLA_MAX, policy); err = nlmsg_parse (nlh, sizeof (*ifi), tb, IFLA_MAX, policy);
if (err < 0) if (err < 0)
@@ -1335,12 +1335,15 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr
lnk_data = _parse_lnk_vxlan (nl_info_kind, nl_info_data); lnk_data = _parse_lnk_vxlan (nl_info_kind, nl_info_data);
break; break;
default: default:
goto no_lnk_data; goto lnk_data_handled;
} }
/* We always try to look into the cache and reuse the object there. /* We always try to look into the cache and reuse the object there.
* We do that, because we consider the lnk object as immutable and don't * We do that, because we consider the lnk object as immutable and don't
* modify it after creating. Hence we can share it and reuse. */ * modify it after creating. Hence we can share it and reuse.
*
* Also, sometimes the info-data is missing for updates. In this case
* we want to keep the previously received lnk_data. */
if (completed_from_cache) { if (completed_from_cache) {
_lookup_cached_link (cache, obj->link.ifindex, completed_from_cache, &link_cached); _lookup_cached_link (cache, obj->link.ifindex, completed_from_cache, &link_cached);
if ( link_cached if ( link_cached
@@ -1352,14 +1355,11 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr
} }
} }
no_lnk_data: lnk_data_handled:
obj->_link.netlink.lnk = lnk_data;
obj->_link.netlink.is_in_netlink = TRUE; obj->_link.netlink.is_in_netlink = TRUE;
id_only_handled:
obj->_link.netlink.lnk = lnk_data;
lnk_data = NULL;
done:
obj_result = obj; obj_result = obj;
obj = NULL; obj = NULL;
errout: errout: