New upstream version 1.27.90 upstream/1.27.90

1 files changed, 143 insertions, 151 deletions

diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index d8c4fb41..1b12915d 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2007 - 2008 Novell, Inc.
  * Copyright (C) 2007 - 2012 Red Hat, Inc.
@@ -21,16 +21,14 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_PATH,
-);
+NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PATH, );
 
 typedef struct _NMObjectPrivate {
-	NMClient *client;
-	NMLDBusObject *dbobj;
+    NMClient *     client;
+    NMLDBusObject *dbobj;
 } NMObjectPrivate;
 
-G_DEFINE_ABSTRACT_TYPE (NMObject, nm_object, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE(NMObject, nm_object, G_TYPE_OBJECT);
 
 #define NM_OBJECT_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMObject, NM_IS_OBJECT)
 
@@ -39,35 +37,35 @@ static NMObjectClass *_nm_object_class = NULL;
 /*****************************************************************************/
 
 static gpointer
-_nm_object_get_private (NMObjectClass *klass, NMObject *self, guint16 extra_offset)
+_nm_object_get_private(NMObjectClass *klass, NMObject *self, guint16 extra_offset)
 {
-	char *ptr;
+    char *ptr;
 
-	nm_assert (klass->priv_ptr_offset > 0);
+    nm_assert(klass->priv_ptr_offset > 0);
 
-	ptr = (char *) self;
-	ptr += klass->priv_ptr_offset;
-	if (klass->priv_ptr_indirect)
-		ptr = *((gpointer *) ptr);
-	return ptr + extra_offset;
+    ptr = (char *) self;
+    ptr += klass->priv_ptr_offset;
+    if (klass->priv_ptr_indirect)
+        ptr = *((gpointer *) ptr);
+    return ptr + extra_offset;
 }
 
 NMLDBusObject *
-_nm_object_get_dbobj (gpointer self)
+_nm_object_get_dbobj(gpointer self)
 {
-	return NM_OBJECT_GET_PRIVATE (self)->dbobj;
+    return NM_OBJECT_GET_PRIVATE(self)->dbobj;
 }
 
 const char *
-_nm_object_get_path (gpointer self)
+_nm_object_get_path(gpointer self)
 {
-	return NM_OBJECT_GET_PRIVATE (self)->dbobj->dbus_path->str;
+    return NM_OBJECT_GET_PRIVATE(self)->dbobj->dbus_path->str;
 }
 
 NMClient *
-_nm_object_get_client (gpointer self)
+_nm_object_get_client(gpointer self)
 {
-	return NM_OBJECT_GET_PRIVATE (self)->client;
+    return NM_OBJECT_GET_PRIVATE(self)->client;
 }
 
 /**
@@ -84,11 +82,11 @@ _nm_object_get_client (gpointer self)
  * whether the object is still alive/cached, check nm_object_get_client().
  **/
 const char *
-nm_object_get_path (NMObject *object)
+nm_object_get_path(NMObject *object)
 {
-	g_return_val_if_fail (NM_IS_OBJECT (object), NULL);
+    g_return_val_if_fail(NM_IS_OBJECT(object), NULL);
 
-	return _nm_object_get_path (object);
+    return _nm_object_get_path(object);
 }
 
 /**
@@ -107,203 +105,197 @@ nm_object_get_path (NMObject *object)
  * Since: 1.24
  **/
 NMClient *
-nm_object_get_client (NMObject *object)
+nm_object_get_client(NMObject *object)
 {
-	g_return_val_if_fail (NM_IS_OBJECT (object), NULL);
+    g_return_val_if_fail(NM_IS_OBJECT(object), NULL);
 
-	return _nm_object_get_client (object);
+    return _nm_object_get_client(object);
 }
 
 /*****************************************************************************/
 
 static void
-clear_properties (NMObject *self,
-                  NMClient *client)
+clear_properties(NMObject *self, NMClient *client)
 {
-	NMObjectClass *klass = NM_OBJECT_GET_CLASS (self);
-	const _NMObjectClassFieldInfo *p;
-
-	nm_assert (NM_IS_OBJECT (self));
-	nm_assert (!client || NM_IS_CLIENT (client));
-
-	for (p = klass->property_o_info; p; p = p->parent) {
-		nml_dbus_property_o_clear_many (_nm_object_get_private (p->klass, self, p->offset),
-		                                p->num,
-		                                client);
-	}
-
-	for (p = klass->property_ao_info; p; p = p->parent) {
-		nml_dbus_property_ao_clear_many (_nm_object_get_private (p->klass, self, p->offset),
-		                                 p->num,
-		                                 client);
-	}
+    NMObjectClass *                klass = NM_OBJECT_GET_CLASS(self);
+    const _NMObjectClassFieldInfo *p;
+
+    nm_assert(NM_IS_OBJECT(self));
+    nm_assert(!client || NM_IS_CLIENT(client));
+
+    for (p = klass->property_o_info; p; p = p->parent) {
+        nml_dbus_property_o_clear_many(_nm_object_get_private(p->klass, self, p->offset),
+                                       p->num,
+                                       client);
+    }
+
+    for (p = klass->property_ao_info; p; p = p->parent) {
+        nml_dbus_property_ao_clear_many(_nm_object_get_private(p->klass, self, p->offset),
+                                        p->num,
+                                        client);
+    }
 }
 
 /*****************************************************************************/
 
 static gboolean
-is_ready (NMObject *self)
+is_ready(NMObject *self)
 {
-	NMObjectClass *klass = NM_OBJECT_GET_CLASS (self);
-	NMClient *client = _nm_object_get_client (self);
-	const _NMObjectClassFieldInfo *p;
-	guint16 i;
+    NMObjectClass *                klass  = NM_OBJECT_GET_CLASS(self);
+    NMClient *                     client = _nm_object_get_client(self);
+    const _NMObjectClassFieldInfo *p;
+    guint16                        i;
 
-	nm_assert (NM_IS_CLIENT (client));
+    nm_assert(NM_IS_CLIENT(client));
 
-	for (p = klass->property_o_info; p; p = p->parent) {
-		NMLDBusPropertyO *fields = _nm_object_get_private (p->klass, self, p->offset);
+    for (p = klass->property_o_info; p; p = p->parent) {
+        NMLDBusPropertyO *fields = _nm_object_get_private(p->klass, self, p->offset);
 
-		for (i = 0; i < p->num; i++) {
-			if (!nml_dbus_property_o_is_ready (&fields[i]))
-				return FALSE;
-		}
-	}
+        for (i = 0; i < p->num; i++) {
+            if (!nml_dbus_property_o_is_ready(&fields[i]))
+                return FALSE;
+        }
+    }
 
-	for (p = klass->property_ao_info; p; p = p->parent) {
-		NMLDBusPropertyAO *fields = _nm_object_get_private (p->klass, self, p->offset);
+    for (p = klass->property_ao_info; p; p = p->parent) {
+        NMLDBusPropertyAO *fields = _nm_object_get_private(p->klass, self, p->offset);
 
-		for (i = 0; i < p->num; i++) {
-			if (!nml_dbus_property_ao_is_ready (&fields[i]))
-				return FALSE;
-		}
-	}
+        for (i = 0; i < p->num; i++) {
+            if (!nml_dbus_property_ao_is_ready(&fields[i]))
+                return FALSE;
+        }
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 static void
-obj_changed_notify (NMObject *self)
+obj_changed_notify(NMObject *self)
 {
-	NMObjectClass *klass = NM_OBJECT_GET_CLASS (self);
-	NMClient *client = _nm_object_get_client (self);
-	const _NMObjectClassFieldInfo *p;
-
-	nm_assert (NM_IS_CLIENT (client));
-
-	for (p = klass->property_o_info; p; p = p->parent) {
-		nml_dbus_property_o_notify_changed_many (_nm_object_get_private (p->klass, self, p->offset),
-		                                         p->num,
-		                                         client);
-	}
-
-	for (p = klass->property_ao_info; p; p = p->parent) {
-		nml_dbus_property_ao_notify_changed_many (_nm_object_get_private (p->klass, self, p->offset),
-		                                          p->num,
-		                                          client);
-	}
+    NMObjectClass *                klass  = NM_OBJECT_GET_CLASS(self);
+    NMClient *                     client = _nm_object_get_client(self);
+    const _NMObjectClassFieldInfo *p;
+
+    nm_assert(NM_IS_CLIENT(client));
+
+    for (p = klass->property_o_info; p; p = p->parent) {
+        nml_dbus_property_o_notify_changed_many(_nm_object_get_private(p->klass, self, p->offset),
+                                                p->num,
+                                                client);
+    }
+
+    for (p = klass->property_ao_info; p; p = p->parent) {
+        nml_dbus_property_ao_notify_changed_many(_nm_object_get_private(p->klass, self, p->offset),
+                                                 p->num,
+                                                 client);
+    }
 }
 
 /*****************************************************************************/
 
 static void
-register_client (NMObject *self,
-                 NMClient *client,
-                 NMLDBusObject *dbobj)
+register_client(NMObject *self, NMClient *client, NMLDBusObject *dbobj)
 {
-	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self);
+    NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE(self);
 
-	nm_assert (!priv->client);
-	nm_assert (NML_IS_DBUS_OBJECT (dbobj));
-	nm_assert (dbobj->nmobj == G_OBJECT (self));
+    nm_assert(!priv->client);
+    nm_assert(NML_IS_DBUS_OBJECT(dbobj));
+    nm_assert(dbobj->nmobj == G_OBJECT(self));
 
-	priv->client = client;
-	priv->dbobj = nml_dbus_object_ref (dbobj);
+    priv->client = client;
+    priv->dbobj  = nml_dbus_object_ref(dbobj);
 }
 
 static void
-unregister_client (NMObject *self,
-                   NMClient *client,
-                   NMLDBusObject *dbobj)
+unregister_client(NMObject *self, NMClient *client, NMLDBusObject *dbobj)
 {
-	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self);
+    NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE(self);
 
-	nm_assert (NM_IS_CLIENT (client));
-	nm_assert (priv->client == client);
-	priv->client = NULL;
+    nm_assert(NM_IS_CLIENT(client));
+    nm_assert(priv->client == client);
+    priv->client = NULL;
 
-	clear_properties (self, client);
+    clear_properties(self, client);
 }
 
 /*****************************************************************************/
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMObject *self = NM_OBJECT (object);
-
-	switch (prop_id) {
-	case PROP_PATH:
-		g_value_set_string (value, nm_object_get_path (self));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMObject *self = NM_OBJECT(object);
+
+    switch (prop_id) {
+    case PROP_PATH:
+        g_value_set_string(value, nm_object_get_path(self));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
 /*****************************************************************************/
 
 static void
-nm_object_init (NMObject *object)
+nm_object_init(NMObject *object)
 {
-	NMObject *self = NM_OBJECT (object);
-	NMObjectPrivate *priv;
+    NMObject *       self = NM_OBJECT(object);
+    NMObjectPrivate *priv;
 
-	priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_OBJECT, NMObjectPrivate);
+    priv = G_TYPE_INSTANCE_GET_PRIVATE(self, NM_TYPE_OBJECT, NMObjectPrivate);
 
-	self->_priv = priv;
+    self->_priv = priv;
 
-	c_list_init (&self->obj_base.queue_notify_lst);
+    c_list_init(&self->obj_base.queue_notify_lst);
 }
 
 static void
-dispose (GObject *object)
+dispose(GObject *object)
 {
-	NMObject *self = NM_OBJECT (object);
-	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self);
+    NMObject *       self = NM_OBJECT(object);
+    NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE(self);
 
-	self->obj_base.is_disposing = TRUE;
+    self->obj_base.is_disposing = TRUE;
 
-	nm_assert (c_list_is_empty (&self->obj_base.queue_notify_lst));
-	nm_assert (!priv->client);
-	nm_assert (!priv->dbobj || !priv->dbobj->nmobj);
+    nm_assert(c_list_is_empty(&self->obj_base.queue_notify_lst));
+    nm_assert(!priv->client);
+    nm_assert(!priv->dbobj || !priv->dbobj->nmobj);
 
-	clear_properties (self, NULL);
+    clear_properties(self, NULL);
 
-	G_OBJECT_CLASS (nm_object_parent_class)->dispose (object);
+    G_OBJECT_CLASS(nm_object_parent_class)->dispose(object);
 
-	nm_clear_pointer (&priv->dbobj, nml_dbus_object_unref);
+    nm_clear_pointer(&priv->dbobj, nml_dbus_object_unref);
 }
 
 static void
-nm_object_class_init (NMObjectClass *klass)
+nm_object_class_init(NMObjectClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-	_nm_object_class = klass;
+    _nm_object_class = klass;
 
-	g_type_class_add_private (klass, sizeof (NMObjectPrivate));
+    g_type_class_add_private(klass, sizeof(NMObjectPrivate));
 
-	object_class->get_property = get_property;
-	object_class->dispose      = dispose;
+    object_class->get_property = get_property;
+    object_class->dispose      = dispose;
 
-	klass->register_client    = register_client;
-	klass->unregister_client  = unregister_client;
-	klass->is_ready           = is_ready;
-	klass->obj_changed_notify = obj_changed_notify;
+    klass->register_client    = register_client;
+    klass->unregister_client  = unregister_client;
+    klass->is_ready           = is_ready;
+    klass->obj_changed_notify = obj_changed_notify;
 
-	/**
-	 * NMObject:path:
-	 *
-	 * The D-Bus object path.
-	 **/
-	obj_properties[PROP_PATH] =
-	    g_param_spec_string (NM_OBJECT_PATH, "", "",
-	                         NULL,
-	                         G_PARAM_READABLE |
-	                         G_PARAM_STATIC_STRINGS);
+    /**
+     * NMObject:path:
+     *
+     * The D-Bus object path.
+     **/
+    obj_properties[PROP_PATH] = g_param_spec_string(NM_OBJECT_PATH,
+                                                    "",
+                                                    "",
+                                                    NULL,
+                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+    g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }