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

core: minor cleanup of handling specific-object in NMActiveConnection

Browse source 
- use nm_assert() for something that ~really~ always should be given.
- use nm_streq0() and nm_clear_g_free().
This commit is contained in:
Thomas Haller 2018-04-11 17:16:28 +02:00
parent 476208d223
commit 580a11da3a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nm-active-connection.c
View file

@ -515,9 +515,9 @@ nm_active_connection_set_specific_object (NMActiveConnection *self,
/* Nothing that calls this function should be using paths from D-Bus,
* where NM uses "/" to mean NULL.
*/
g_assert (g_strcmp0 (specific_object, "/") != 0);
nm_assert (!nm_streq0 (specific_object, "/"));
if (g_strcmp0 (priv->specific_object, specific_object) == 0)
if (nm_streq0 (priv->specific_object, specific_object))
return;
g_free (priv->specific_object);
@ -1430,8 +1430,7 @@ dispose (GObject *object)
auth_cancel (self);
g_free (priv->specific_object);
priv->specific_object = NULL;
nm_clear_g_free (&priv->specific_object);
_set_settings_connection (self, NULL);
g_clear_object (&priv->applied_connection);