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

libnm-core: minor cleanups in nm-setting-vlan.c

Browse source 
Don't g_warn() from within the library. It's not clear
that the caller did something wrong, we shouldn't issue
glog warnings.
This commit is contained in:
Thomas Haller 2016-11-02 15:22:56 +01:00
parent f23320478d
commit 64ed277380
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnm-core/nm-setting-vlan.c
View file

@ -147,13 +147,11 @@ priority_map_new_from_str (NMVlanPriorityMap map, const char *str)
to = g_ascii_strtoull (t[1], NULL, 10);
if ((from <= get_max_prio (map, TRUE)) && (to <= get_max_prio (map, FALSE))) {
p = g_malloc0 (sizeof (NMVlanQosMapping));
G_STATIC_ASSERT (sizeof (*p) == sizeof (p->from) + sizeof (p->to));
p = g_malloc (sizeof (NMVlanQosMapping));
p->from = from;
p->to = to;
}
} else {
/* Warn */
g_warn_if_fail (len == 2);
}
g_strfreev (t);
@ -747,13 +745,11 @@ set_property (GObject *object, guint prop_id,
break;
case PROP_INGRESS_PRIORITY_MAP:
g_slist_free_full (priv->ingress_priority_map, g_free);
priv->ingress_priority_map =
priority_strv_to_maplist (NM_VLAN_INGRESS_MAP, g_value_get_boxed (value));
priv->ingress_priority_map = priority_strv_to_maplist (NM_VLAN_INGRESS_MAP, g_value_get_boxed (value));
break;
case PROP_EGRESS_PRIORITY_MAP:
g_slist_free_full (priv->egress_priority_map, g_free);
priv->egress_priority_map =
priority_strv_to_maplist (NM_VLAN_EGRESS_MAP, g_value_get_boxed (value));
priv->egress_priority_map = priority_strv_to_maplist (NM_VLAN_EGRESS_MAP, g_value_get_boxed (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);