New upstream version 1.27.90 upstream/1.27.90

1 files changed, 98 insertions, 93 deletions

diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 2b9c96a8..9e2f543c 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2013 Red Hat, Inc.
  */
@@ -13,26 +13,25 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_TYPE_DESCRIPTION,
-);
+NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_TYPE_DESCRIPTION, );
 
 typedef struct {
-	char *type_description;
+    char *type_description;
 } NMDeviceGenericPrivate;
 
 struct _NMDeviceGeneric {
-	NMDevice parent;
-	NMDeviceGenericPrivate _priv;
+    NMDevice               parent;
+    NMDeviceGenericPrivate _priv;
 };
 
 struct _NMDeviceGenericClass {
-	NMDeviceClass parent;
+    NMDeviceClass parent;
 };
 
-G_DEFINE_TYPE (NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
+G_DEFINE_TYPE(NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
 
-#define NM_DEVICE_GENERIC_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceGeneric, NM_IS_DEVICE_GENERIC, NMObject, NMDevice)
+#define NM_DEVICE_GENERIC_GET_PRIVATE(self) \
+    _NM_GET_PRIVATE(self, NMDeviceGeneric, NM_IS_DEVICE_GENERIC, NMObject, NMDevice)
 
 /*****************************************************************************/
 
@@ -48,123 +47,129 @@ G_DEFINE_TYPE (NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
  * Deprecated: 1.24: Use nm_device_get_hw_address() instead.
  **/
 const char *
-nm_device_generic_get_hw_address (NMDeviceGeneric *device)
+nm_device_generic_get_hw_address(NMDeviceGeneric *device)
 {
-	g_return_val_if_fail (NM_IS_DEVICE_GENERIC (device), NULL);
+    g_return_val_if_fail(NM_IS_DEVICE_GENERIC(device), NULL);
 
-	return nm_device_get_hw_address (NM_DEVICE (device));
+    return nm_device_get_hw_address(NM_DEVICE(device));
 }
 
 /*****************************************************************************/
 
 static const char *
-get_type_description (NMDevice *device)
+get_type_description(NMDevice *device)
 {
-	NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (device);
+    NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE(device);
 
-	return _nml_coerce_property_str_not_empty (priv->type_description);
+    return _nml_coerce_property_str_not_empty(priv->type_description);
 }
 
 static gboolean
-connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+connection_compatible(NMDevice *device, NMConnection *connection, GError **error)
 {
-	const char *iface_name;
-
-	if (!NM_DEVICE_CLASS (nm_device_generic_parent_class)->connection_compatible (device, connection, error))
-		return FALSE;
-
-	if (!nm_connection_is_type (connection, NM_SETTING_GENERIC_SETTING_NAME)) {
-		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-		                     _("The connection was not a generic connection."));
-		return FALSE;
-	}
-
-	iface_name = nm_connection_get_interface_name (connection);
-	if (!iface_name) {
-		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION,
-		                     _("The connection did not specify an interface name."));
-		return FALSE;
-	}
-
-	return TRUE;
+    const char *iface_name;
+
+    if (!NM_DEVICE_CLASS(nm_device_generic_parent_class)
+             ->connection_compatible(device, connection, error))
+        return FALSE;
+
+    if (!nm_connection_is_type(connection, NM_SETTING_GENERIC_SETTING_NAME)) {
+        g_set_error_literal(error,
+                            NM_DEVICE_ERROR,
+                            NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+                            _("The connection was not a generic connection."));
+        return FALSE;
+    }
+
+    iface_name = nm_connection_get_interface_name(connection);
+    if (!iface_name) {
+        g_set_error_literal(error,
+                            NM_DEVICE_ERROR,
+                            NM_DEVICE_ERROR_INVALID_CONNECTION,
+                            _("The connection did not specify an interface name."));
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 static GType
-get_setting_type (NMDevice *device)
+get_setting_type(NMDevice *device)
 {
-	return NM_TYPE_SETTING_GENERIC;
+    return NM_TYPE_SETTING_GENERIC;
 }
 
 /*****************************************************************************/
 
 static void
-nm_device_generic_init (NMDeviceGeneric *device)
-{
-}
+nm_device_generic_init(NMDeviceGeneric *device)
+{}
 
 static void
-finalize (GObject *object)
+finalize(GObject *object)
 {
-	NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (object);
+    NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE(object);
 
-	g_free (priv->type_description);
+    g_free(priv->type_description);
 
-	G_OBJECT_CLASS (nm_device_generic_parent_class)->finalize (object);
+    G_OBJECT_CLASS(nm_device_generic_parent_class)->finalize(object);
 }
 
 static void
-get_property (GObject *object,
-              guint prop_id,
-              GValue *value,
-              GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMDeviceGeneric *self = NM_DEVICE_GENERIC (object);
-
-	switch (prop_id) {
-	case PROP_TYPE_DESCRIPTION:
-		g_value_set_string (value, get_type_description ((NMDevice *) self));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMDeviceGeneric *self = NM_DEVICE_GENERIC(object);
+
+    switch (prop_id) {
+    case PROP_TYPE_DESCRIPTION:
+        g_value_set_string(value, get_type_description((NMDevice *) self));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
-const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_generic = NML_DBUS_META_IFACE_INIT_PROP (
-	NM_DBUS_INTERFACE_DEVICE_GENERIC,
-	nm_device_generic_get_type,
-	NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
-	NML_DBUS_META_IFACE_DBUS_PROPERTIES (
-		NML_DBUS_META_PROPERTY_INIT_FCN ("HwAddress",       0,                     "s",             _nm_device_notify_update_prop_hw_address ),
-		NML_DBUS_META_PROPERTY_INIT_S   ("TypeDescription", PROP_TYPE_DESCRIPTION, NMDeviceGeneric, _priv.type_description                   ),
-	),
-);
+const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_generic = NML_DBUS_META_IFACE_INIT_PROP(
+    NM_DBUS_INTERFACE_DEVICE_GENERIC,
+    nm_device_generic_get_type,
+    NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
+    NML_DBUS_META_IFACE_DBUS_PROPERTIES(
+        NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
+                                        0,
+                                        "s",
+                                        _nm_device_notify_update_prop_hw_address),
+        NML_DBUS_META_PROPERTY_INIT_S("TypeDescription",
+                                      PROP_TYPE_DESCRIPTION,
+                                      NMDeviceGeneric,
+                                      _priv.type_description), ), );
 
 static void
-nm_device_generic_class_init (NMDeviceGenericClass *klass)
+nm_device_generic_class_init(NMDeviceGenericClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
-
-	object_class->get_property = get_property;
-	object_class->finalize     = finalize;
-
-	device_class->get_type_description  = get_type_description;
-	device_class->connection_compatible = connection_compatible;
-	device_class->get_setting_type      = get_setting_type;
-
-
-	/**
-	 * NMDeviceGeneric:type-description:
-	 *
-	 * A description of the specific type of device this is, or %NULL
-	 * if not known.
-	 **/
-	obj_properties[PROP_TYPE_DESCRIPTION] =
-	    g_param_spec_string (NM_DEVICE_GENERIC_TYPE_DESCRIPTION, "", "",
-	                         NULL,
-	                         G_PARAM_READABLE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	_nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_device_generic);
+    GObjectClass * object_class = G_OBJECT_CLASS(klass);
+    NMDeviceClass *device_class = NM_DEVICE_CLASS(klass);
+
+    object_class->get_property = get_property;
+    object_class->finalize     = finalize;
+
+    device_class->get_type_description  = get_type_description;
+    device_class->connection_compatible = connection_compatible;
+    device_class->get_setting_type      = get_setting_type;
+
+    /**
+     * NMDeviceGeneric:type-description:
+     *
+     * A description of the specific type of device this is, or %NULL
+     * if not known.
+     **/
+    obj_properties[PROP_TYPE_DESCRIPTION] =
+        g_param_spec_string(NM_DEVICE_GENERIC_TYPE_DESCRIPTION,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    _nml_dbus_meta_class_init_with_properties(object_class,
+                                              &_nml_dbus_meta_iface_nm_device_generic);
 }