diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-20 10:07:03 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-20 10:29:27 +0200 |
| commit | 3e831012e82215247d2808a72673ca28397c6177 (patch) | |
| tree | 36c37772063114997e497dec4fa38df4f2e1e48b | |
| parent | 0a547fe3ec835e4bd2a60bc38e2937d94f3cc870 (diff) | |
| download | NetworkManager-lr/nm-1-2.tar.gz | |
platform: avoid using the nm_platform_link_*() getters excessivelylr/nm-1-2
Thomas thinks it's a sin.
| -rw-r--r-- | src/platform/nm-platform.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 26ac766d63..0139867a0c 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -1895,8 +1895,8 @@ _infiniband_add_add_or_delete (NMPlatform *self, gboolean add, const NMPlatformLink **out_link) { - gs_free char *parent_name = NULL; gs_free char *name = NULL; + const NMPlatformLink *parent_link; NMPlatformError plerr; _CHECK_SELF (self, klass, NM_PLATFORM_ERROR_BUG); @@ -1904,12 +1904,14 @@ _infiniband_add_add_or_delete (NMPlatform *self, g_return_val_if_fail (parent >= 0, NM_PLATFORM_ERROR_BUG); g_return_val_if_fail (p_key >= 0, NM_PLATFORM_ERROR_BUG); - parent_name = g_strdup (nm_platform_link_get_name (self, parent)); - if ( !parent_name - || nm_platform_link_get_type (self, parent) != NM_LINK_TYPE_INFINIBAND) + parent_link = nm_platform_link_get (self, parent); + if (!parent_link) + return NM_PLATFORM_ERROR_NOT_FOUND; + + if (parent_link->type != NM_LINK_TYPE_INFINIBAND) return NM_PLATFORM_ERROR_WRONG_TYPE; - name = g_strdup_printf ("%s.%04x", parent_name, p_key); + name = g_strdup_printf ("%s.%04x", parent_link->name, p_key); if (add) { plerr = _link_add_check_existing (self, name, NM_LINK_TYPE_INFINIBAND, out_link); @@ -1917,7 +1919,7 @@ _infiniband_add_add_or_delete (NMPlatform *self, return plerr; _LOGD ("link: adding infiniband partition %s for parent '%s' (%d), key %d", - name, parent_name, parent, p_key); + name, parent_link->name, parent, p_key); if (!klass->infiniband_partition_add (self, parent, p_key, out_link)) return NM_PLATFORM_ERROR_UNSPECIFIED; } else { |