New upstream version 1.27.90 upstream/1.27.90

1 files changed, 44 insertions, 41 deletions

diff --git a/libnm/nm-device-ovs-interface.c b/libnm/nm-device-ovs-interface.c
index a2e3b2cf..7ed55c79 100644
--- a/libnm/nm-device-ovs-interface.c
+++ b/libnm/nm-device-ovs-interface.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2017 Red Hat, Inc.
  */
@@ -15,72 +15,75 @@
 /*****************************************************************************/
 
 struct _NMDeviceOvsInterface {
-	NMDevice parent;
+    NMDevice parent;
 };
 
 struct _NMDeviceOvsInterfaceClass {
-	NMDeviceClass parent;
+    NMDeviceClass parent;
 };
 
-G_DEFINE_TYPE (NMDeviceOvsInterface, nm_device_ovs_interface, NM_TYPE_DEVICE)
+G_DEFINE_TYPE(NMDeviceOvsInterface, nm_device_ovs_interface, NM_TYPE_DEVICE)
 
 /*****************************************************************************/
 
 static const char *
-get_type_description (NMDevice *device)
+get_type_description(NMDevice *device)
 {
-	return "ovs-interface";
+    return "ovs-interface";
 }
 
 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_ovs_interface_parent_class)->connection_compatible (device, connection, error))
-		return FALSE;
-
-	if (!nm_connection_is_type (connection, NM_SETTING_OVS_INTERFACE_SETTING_NAME)) {
-		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-		                     _("The connection was not a ovs_interface 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_ovs_interface_parent_class)
+             ->connection_compatible(device, connection, error))
+        return FALSE;
+
+    if (!nm_connection_is_type(connection, NM_SETTING_OVS_INTERFACE_SETTING_NAME)) {
+        g_set_error_literal(error,
+                            NM_DEVICE_ERROR,
+                            NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+                            _("The connection was not a ovs_interface 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_OVS_INTERFACE;
+    return NM_TYPE_SETTING_OVS_INTERFACE;
 }
 
 /*****************************************************************************/
 
 static void
-nm_device_ovs_interface_init (NMDeviceOvsInterface *device)
-{
-}
+nm_device_ovs_interface_init(NMDeviceOvsInterface *device)
+{}
 
-const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsinterface = NML_DBUS_META_IFACE_INIT (
-	NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE,
-	nm_device_ovs_interface_get_type,
-	NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
-);
+const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsinterface =
+    NML_DBUS_META_IFACE_INIT(NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE,
+                             nm_device_ovs_interface_get_type,
+                             NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, );
 
 static void
-nm_device_ovs_interface_class_init (NMDeviceOvsInterfaceClass *ovs_interface_class)
+nm_device_ovs_interface_class_init(NMDeviceOvsInterfaceClass *ovs_interface_class)
 {
-	NMDeviceClass *device_class = NM_DEVICE_CLASS (ovs_interface_class);
+    NMDeviceClass *device_class = NM_DEVICE_CLASS(ovs_interface_class);
 
-	device_class->get_type_description = get_type_description;
-	device_class->connection_compatible = connection_compatible;
-	device_class->get_setting_type = get_setting_type;
+    device_class->get_type_description  = get_type_description;
+    device_class->connection_compatible = connection_compatible;
+    device_class->get_setting_type      = get_setting_type;
 }