diff options
author | Thomas Haller <thaller@redhat.com> | 2021-03-12 09:40:07 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-03-12 12:40:26 +0100 |
commit | 839d7d5fbe1cbd3259568d7c98d7e92e425a0c64 (patch) | |
tree | fb65bf25b6635d8f750f6e3b0db6cf57a99bdaf7 | |
parent | 0de37bae112a496b8b1ee3772d2a378376bcdba6 (diff) | |
download | NetworkManager-839d7d5fbe1cbd3259568d7c98d7e92e425a0c64.tar.gz |
libnm: call nm_lldp_neighbor_get_attr_value() from redundant helpers
-rw-r--r-- | src/libnm-client-impl/nm-device.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c index dcbbdbbc16..2522199d89 100644 --- a/src/libnm-client-impl/nm-device.c +++ b/src/libnm-client-impl/nm-device.c @@ -3018,10 +3018,7 @@ nm_lldp_neighbor_get_attr_string_value(NMLldpNeighbor *neighbor, { GVariant *variant; - g_return_val_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor), FALSE); - g_return_val_if_fail(name && name[0], FALSE); - - variant = g_hash_table_lookup(neighbor->attrs, name); + variant = nm_lldp_neighbor_get_attr_value(neighbor, name); if (!variant || !g_variant_is_of_type(variant, G_VARIANT_TYPE_STRING)) return FALSE; @@ -3046,10 +3043,7 @@ nm_lldp_neighbor_get_attr_uint_value(NMLldpNeighbor *neighbor, const char *name, { GVariant *variant; - g_return_val_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor), FALSE); - g_return_val_if_fail(name && name[0], FALSE); - - variant = g_hash_table_lookup(neighbor->attrs, name); + variant = nm_lldp_neighbor_get_attr_value(neighbor, name); if (!variant || !g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32)) return FALSE; @@ -3073,10 +3067,7 @@ nm_lldp_neighbor_get_attr_type(NMLldpNeighbor *neighbor, const char *name) { GVariant *variant; - g_return_val_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor), NULL); - g_return_val_if_fail(name && name[0], NULL); - - variant = g_hash_table_lookup(neighbor->attrs, name); + variant = nm_lldp_neighbor_get_attr_value(neighbor, name); if (!variant) return NULL; |