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

libnm/lldp: cleanup asserting for valid NMLldpNeighbor agument

Browse Source 
At a few places we checked whether neighbor->attrs was non-NULL.
That is not necessary, unless we'd like to catch some dangling/invalid
pointers. The attrs hash is always set otherwise.

Instead of just dropping the check, add a NM_IS_LLDP_NEIGHBOR() macro
(inline function).
This commit is contained in:
Thomas Haller
2019-01-30 07:42:33 +01:00
committed by Beniamino Galvani
parent 95aa7ac91e
commit 5b51a1a9f7
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libnm/nm-device.c
View File

@@ -2649,6 +2649,18 @@ nm_device_get_setting_type (NMDevice *device)
return NM_DEVICE_GET_CLASS (device)->get_setting_type (device); return NM_DEVICE_GET_CLASS (device)->get_setting_type (device);
} }
/*****************************************************************************/
static gboolean
NM_IS_LLDP_NEIGHBOR (const NMLldpNeighbor *self)
{
nm_assert ( !self
|| ( self->refcount > 0
&& self->attrs));
return self
&& self->refcount > 0;
}
/** /**
* nm_lldp_neighbor_new: * nm_lldp_neighbor_new:
* *
@@ -2699,8 +2711,7 @@ nm_lldp_neighbor_dup (NMLldpNeighbor *neighbor)
void void
nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor) nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor)
{ {
g_return_if_fail (neighbor); g_return_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor));
g_return_if_fail (neighbor->refcount > 0);
neighbor->refcount++; neighbor->refcount++;
} }
@@ -2717,11 +2728,9 @@ nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor)
void void
nm_lldp_neighbor_unref (NMLldpNeighbor *neighbor) nm_lldp_neighbor_unref (NMLldpNeighbor *neighbor)
{ {
g_return_if_fail (neighbor); g_return_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor));
g_return_if_fail (neighbor->refcount > 0);
if (--neighbor->refcount == 0) { if (--neighbor->refcount == 0) {
g_return_if_fail (neighbor->attrs);
g_hash_table_unref (neighbor->attrs); g_hash_table_unref (neighbor->attrs);
g_free (neighbor); g_free (neighbor);
} }
@@ -2744,8 +2753,7 @@ nm_lldp_neighbor_get_attr_names (NMLldpNeighbor *neighbor)
const char *key; const char *key;
GPtrArray *names; GPtrArray *names;
g_return_val_if_fail (neighbor, NULL); g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), NULL);
g_return_val_if_fail (neighbor->attrs, NULL);
names = g_ptr_array_new (); names = g_ptr_array_new ();
@@ -2776,7 +2784,7 @@ nm_lldp_neighbor_get_attr_string_value (NMLldpNeighbor *neighbor, const char *na
{ {
GVariant *variant; GVariant *variant;
g_return_val_if_fail (neighbor, FALSE); g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), FALSE);
g_return_val_if_fail (name && name[0], FALSE); g_return_val_if_fail (name && name[0], FALSE);
variant = g_hash_table_lookup (neighbor->attrs, name); variant = g_hash_table_lookup (neighbor->attrs, name);
@@ -2806,7 +2814,7 @@ nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, const char *name
{ {
GVariant *variant; GVariant *variant;
g_return_val_if_fail (neighbor, FALSE); g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), FALSE);
g_return_val_if_fail (name && name[0], FALSE); g_return_val_if_fail (name && name[0], FALSE);
variant = g_hash_table_lookup (neighbor->attrs, name); variant = g_hash_table_lookup (neighbor->attrs, name);
@@ -2833,7 +2841,7 @@ nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, const char *name
GVariant * GVariant *
nm_lldp_neighbor_get_attr_value (NMLldpNeighbor *neighbor, const char *name) nm_lldp_neighbor_get_attr_value (NMLldpNeighbor *neighbor, const char *name)
{ {
g_return_val_if_fail (neighbor, FALSE); g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), FALSE);
g_return_val_if_fail (name && name[0], FALSE); g_return_val_if_fail (name && name[0], FALSE);
return g_hash_table_lookup (neighbor->attrs, name); return g_hash_table_lookup (neighbor->attrs, name);
@@ -2855,7 +2863,7 @@ nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, const char *name)
{ {
GVariant *variant; GVariant *variant;
g_return_val_if_fail (neighbor, NULL); g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), NULL);
g_return_val_if_fail (name && name[0], NULL); g_return_val_if_fail (name && name[0], NULL);
variant = g_hash_table_lookup (neighbor->attrs, name); variant = g_hash_table_lookup (neighbor->attrs, name);
@@ -2863,5 +2871,4 @@ nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, const char *name)
return g_variant_get_type (variant); return g_variant_get_type (variant);
else else
return NULL; return NULL;
} }