New upstream version 1.27.90 upstream/1.27.90

1 files changed, 25 insertions, 22 deletions

diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
index 4467cc3f..402cdd26 100644
--- a/libnm/nm-device-macvlan.h
+++ b/libnm/nm-device-macvlan.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  */
@@ -6,26 +6,29 @@
 #ifndef __NM_DEVICE_MACVLAN_H__
 #define __NM_DEVICE_MACVLAN_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-device.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_DEVICE_MACVLAN            (nm_device_macvlan_get_type ())
-#define NM_DEVICE_MACVLAN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlan))
-#define NM_DEVICE_MACVLAN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass))
-#define NM_IS_DEVICE_MACVLAN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_MACVLAN))
-#define NM_IS_DEVICE_MACVLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_MACVLAN))
-#define NM_DEVICE_MACVLAN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass))
-
-#define NM_DEVICE_MACVLAN_PARENT      "parent"
-#define NM_DEVICE_MACVLAN_MODE        "mode"
-#define NM_DEVICE_MACVLAN_NO_PROMISC  "no-promisc"
-#define NM_DEVICE_MACVLAN_TAP         "tap"
-#define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
+#define NM_TYPE_DEVICE_MACVLAN (nm_device_macvlan_get_type())
+#define NM_DEVICE_MACVLAN(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlan))
+#define NM_DEVICE_MACVLAN_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass))
+#define NM_IS_DEVICE_MACVLAN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DEVICE_MACVLAN))
+#define NM_IS_DEVICE_MACVLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DEVICE_MACVLAN))
+#define NM_DEVICE_MACVLAN_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass))
+
+#define NM_DEVICE_MACVLAN_PARENT     "parent"
+#define NM_DEVICE_MACVLAN_MODE       "mode"
+#define NM_DEVICE_MACVLAN_NO_PROMISC "no-promisc"
+#define NM_DEVICE_MACVLAN_TAP        "tap"
+#define NM_DEVICE_MACVLAN_HW_ADDRESS "hw-address"
 
 /**
  * NMDeviceMacvlan:
@@ -33,20 +36,20 @@ G_BEGIN_DECLS
 typedef struct _NMDeviceMacvlanClass NMDeviceMacvlanClass;
 
 NM_AVAILABLE_IN_1_2
-GType nm_device_macvlan_get_type (void);
+GType nm_device_macvlan_get_type(void);
 
 NM_AVAILABLE_IN_1_2
-NMDevice *   nm_device_macvlan_get_parent      (NMDeviceMacvlan *device);
+NMDevice *nm_device_macvlan_get_parent(NMDeviceMacvlan *device);
 NM_AVAILABLE_IN_1_2
-const char * nm_device_macvlan_get_mode        (NMDeviceMacvlan *device);
+const char *nm_device_macvlan_get_mode(NMDeviceMacvlan *device);
 NM_AVAILABLE_IN_1_2
-gboolean     nm_device_macvlan_get_no_promisc  (NMDeviceMacvlan *device);
+gboolean nm_device_macvlan_get_no_promisc(NMDeviceMacvlan *device);
 NM_AVAILABLE_IN_1_2
-gboolean     nm_device_macvlan_get_tap         (NMDeviceMacvlan *device);
+gboolean nm_device_macvlan_get_tap(NMDeviceMacvlan *device);
 
 NM_AVAILABLE_IN_1_2
-NM_DEPRECATED_IN_1_24_FOR (nm_device_get_hw_address)
-const char * nm_device_macvlan_get_hw_address  (NMDeviceMacvlan *device);
+NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address)
+const char *nm_device_macvlan_get_hw_address(NMDeviceMacvlan *device);
 
 G_END_DECLS