New upstream version 1.27.90 upstream/1.27.90

1 files changed, 100 insertions, 96 deletions

diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 194bb199..bac15af7 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2011 - 2012 Red Hat, Inc.
  */
@@ -14,26 +14,25 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_CARRIER,
-);
+NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_CARRIER, );
 
 typedef struct {
-	bool carrier;
+    bool carrier;
 } NMDeviceInfinibandPrivate;
 
 struct _NMDeviceInfiniband {
-	NMDevice parent;
-	NMDeviceInfinibandPrivate _priv;
+    NMDevice                  parent;
+    NMDeviceInfinibandPrivate _priv;
 };
 
 struct _NMDeviceInfinibandClass {
-	NMDeviceClass parent;
+    NMDeviceClass parent;
 };
 
-G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
+G_DEFINE_TYPE(NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
 
-#define NM_DEVICE_INFINIBAND_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceInfiniband, NM_IS_DEVICE_INFINIBAND, NMObject, NMDevice)
+#define NM_DEVICE_INFINIBAND_GET_PRIVATE(self) \
+    _NM_GET_PRIVATE(self, NMDeviceInfiniband, NM_IS_DEVICE_INFINIBAND, NMObject, NMDevice)
 
 /*****************************************************************************/
 
@@ -49,11 +48,11 @@ G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
  * Deprecated: 1.24: Use nm_device_get_hw_address() instead.
  **/
 const char *
-nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device)
+nm_device_infiniband_get_hw_address(NMDeviceInfiniband *device)
 {
-	g_return_val_if_fail (NM_IS_DEVICE_INFINIBAND (device), NULL);
+    g_return_val_if_fail(NM_IS_DEVICE_INFINIBAND(device), NULL);
 
-	return nm_device_get_hw_address (NM_DEVICE (device));
+    return nm_device_get_hw_address(NM_DEVICE(device));
 }
 
 /**
@@ -65,110 +64,115 @@ nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device)
  * Returns: %TRUE if the device has carrier
  **/
 gboolean
-nm_device_infiniband_get_carrier (NMDeviceInfiniband *device)
+nm_device_infiniband_get_carrier(NMDeviceInfiniband *device)
 {
-	g_return_val_if_fail (NM_IS_DEVICE_INFINIBAND (device), FALSE);
+    g_return_val_if_fail(NM_IS_DEVICE_INFINIBAND(device), FALSE);
 
-	return NM_DEVICE_INFINIBAND_GET_PRIVATE (device)->carrier;
+    return NM_DEVICE_INFINIBAND_GET_PRIVATE(device)->carrier;
 }
 
 static gboolean
-connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+connection_compatible(NMDevice *device, NMConnection *connection, GError **error)
 {
-	NMSettingInfiniband *s_infiniband;
-	const char *hwaddr, *setting_hwaddr;
-
-	if (!NM_DEVICE_CLASS (nm_device_infiniband_parent_class)->connection_compatible (device, connection, error))
-		return FALSE;
-
-	if (!nm_connection_is_type (connection, NM_SETTING_INFINIBAND_SETTING_NAME)) {
-		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-		                     _("The connection was not an InfiniBand connection."));
-		return FALSE;
-	}
-
-	hwaddr = nm_device_get_hw_address (NM_DEVICE (device));
-	if (hwaddr) {
-		if (!nm_utils_hwaddr_valid (hwaddr, INFINIBAND_ALEN)) {
-			g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
-			                     _("Invalid device MAC address."));
-			return FALSE;
-		}
-
-		s_infiniband = nm_connection_get_setting_infiniband (connection);
-		setting_hwaddr = nm_setting_infiniband_get_mac_address (s_infiniband);
-		if (setting_hwaddr && !nm_utils_hwaddr_matches (setting_hwaddr, -1, hwaddr, -1)) {
-			g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-			                     _("The MACs of the device and the connection didn't match."));
-			return FALSE;
-		}
-	}
-
-	return TRUE;
+    NMSettingInfiniband *s_infiniband;
+    const char *         hwaddr, *setting_hwaddr;
+
+    if (!NM_DEVICE_CLASS(nm_device_infiniband_parent_class)
+             ->connection_compatible(device, connection, error))
+        return FALSE;
+
+    if (!nm_connection_is_type(connection, NM_SETTING_INFINIBAND_SETTING_NAME)) {
+        g_set_error_literal(error,
+                            NM_DEVICE_ERROR,
+                            NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+                            _("The connection was not an InfiniBand connection."));
+        return FALSE;
+    }
+
+    hwaddr = nm_device_get_hw_address(NM_DEVICE(device));
+    if (hwaddr) {
+        if (!nm_utils_hwaddr_valid(hwaddr, INFINIBAND_ALEN)) {
+            g_set_error_literal(error,
+                                NM_DEVICE_ERROR,
+                                NM_DEVICE_ERROR_FAILED,
+                                _("Invalid device MAC address."));
+            return FALSE;
+        }
+
+        s_infiniband   = nm_connection_get_setting_infiniband(connection);
+        setting_hwaddr = nm_setting_infiniband_get_mac_address(s_infiniband);
+        if (setting_hwaddr && !nm_utils_hwaddr_matches(setting_hwaddr, -1, hwaddr, -1)) {
+            g_set_error_literal(error,
+                                NM_DEVICE_ERROR,
+                                NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+                                _("The MACs of the device and the connection didn't match."));
+            return FALSE;
+        }
+    }
+
+    return TRUE;
 }
 
 static GType
-get_setting_type (NMDevice *device)
+get_setting_type(NMDevice *device)
 {
-	return NM_TYPE_SETTING_INFINIBAND;
+    return NM_TYPE_SETTING_INFINIBAND;
 }
 
 /*****************************************************************************/
 
 static void
-nm_device_infiniband_init (NMDeviceInfiniband *device)
-{
-}
+nm_device_infiniband_init(NMDeviceInfiniband *device)
+{}
 
 static void
-get_property (GObject *object,
-              guint prop_id,
-              GValue *value,
-              GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMDeviceInfiniband *device = NM_DEVICE_INFINIBAND (object);
-
-	switch (prop_id) {
-	case PROP_CARRIER:
-		g_value_set_boolean (value, nm_device_infiniband_get_carrier (device));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMDeviceInfiniband *device = NM_DEVICE_INFINIBAND(object);
+
+    switch (prop_id) {
+    case PROP_CARRIER:
+        g_value_set_boolean(value, nm_device_infiniband_get_carrier(device));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
-const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_infiniband = NML_DBUS_META_IFACE_INIT_PROP (
-	NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
-	nm_device_infiniband_get_type,
-	NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
-	NML_DBUS_META_IFACE_DBUS_PROPERTIES (
-		NML_DBUS_META_PROPERTY_INIT_B   ("Carrier",   PROP_CARRIER,    NMDeviceInfiniband, _priv.carrier                            ),
-		NML_DBUS_META_PROPERTY_INIT_FCN ("HwAddress", 0,               "s",                _nm_device_notify_update_prop_hw_address ),
-	),
-);
+const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_infiniband = NML_DBUS_META_IFACE_INIT_PROP(
+    NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
+    nm_device_infiniband_get_type,
+    NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
+    NML_DBUS_META_IFACE_DBUS_PROPERTIES(
+        NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceInfiniband, _priv.carrier),
+        NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
+                                        0,
+                                        "s",
+                                        _nm_device_notify_update_prop_hw_address), ), );
 
 static void
-nm_device_infiniband_class_init (NMDeviceInfinibandClass *ib_class)
+nm_device_infiniband_class_init(NMDeviceInfinibandClass *ib_class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (ib_class);
-	NMDeviceClass *device_class = NM_DEVICE_CLASS (ib_class);
-
-	object_class->get_property = get_property;
-
-	device_class->connection_compatible = connection_compatible;
-	device_class->get_setting_type      = get_setting_type;
-
-	/**
-	 * NMDeviceInfiniband:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
-	obj_properties[PROP_CARRIER] =
-	    g_param_spec_boolean (NM_DEVICE_INFINIBAND_CARRIER, "", "",
-	                          FALSE,
-	                          G_PARAM_READABLE |
-	                          G_PARAM_STATIC_STRINGS);
-
-	_nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_device_infiniband);
+    GObjectClass * object_class = G_OBJECT_CLASS(ib_class);
+    NMDeviceClass *device_class = NM_DEVICE_CLASS(ib_class);
+
+    object_class->get_property = get_property;
+
+    device_class->connection_compatible = connection_compatible;
+    device_class->get_setting_type      = get_setting_type;
+
+    /**
+     * NMDeviceInfiniband:carrier:
+     *
+     * Whether the device has carrier.
+     **/
+    obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_INFINIBAND_CARRIER,
+                                                        "",
+                                                        "",
+                                                        FALSE,
+                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    _nml_dbus_meta_class_init_with_properties(object_class,
+                                              &_nml_dbus_meta_iface_nm_device_infiniband);
 }