Merge branch 'debian/master' into ubuntu/master

1 files changed, 30 insertions, 27 deletions

diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h
index f0b6a660..0d63afbb 100644
--- a/libnm-core/nm-setting-serial.h
+++ b/libnm-core/nm-setting-serial.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2007 - 2008 Red Hat, Inc.
  * Copyright (C) 2007 - 2008 Novell, Inc.
@@ -7,20 +7,23 @@
 #ifndef __NM_SETTING_SERIAL_H__
 #define __NM_SETTING_SERIAL_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-setting.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_SETTING_SERIAL            (nm_setting_serial_get_type ())
-#define NM_SETTING_SERIAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_SERIAL, NMSettingSerial))
-#define NM_SETTING_SERIAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_SERIAL, NMSettingSerialClass))
-#define NM_IS_SETTING_SERIAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_SERIAL))
-#define NM_IS_SETTING_SERIAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_SERIAL))
-#define NM_SETTING_SERIAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_SERIAL, NMSettingSerialClass))
+#define NM_TYPE_SETTING_SERIAL (nm_setting_serial_get_type())
+#define NM_SETTING_SERIAL(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_SERIAL, NMSettingSerial))
+#define NM_SETTING_SERIAL_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_SERIAL, NMSettingSerialClass))
+#define NM_IS_SETTING_SERIAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_SERIAL))
+#define NM_IS_SETTING_SERIAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_SERIAL))
+#define NM_SETTING_SERIAL_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_SERIAL, NMSettingSerialClass))
 
 #define NM_SETTING_SERIAL_SETTING_NAME "serial"
 
@@ -33,15 +36,15 @@ G_BEGIN_DECLS
  * The parity setting of a serial port.
  */
 typedef enum {
-	NM_SETTING_SERIAL_PARITY_NONE = 0,
-	NM_SETTING_SERIAL_PARITY_EVEN,
-	NM_SETTING_SERIAL_PARITY_ODD
+    NM_SETTING_SERIAL_PARITY_NONE = 0,
+    NM_SETTING_SERIAL_PARITY_EVEN,
+    NM_SETTING_SERIAL_PARITY_ODD
 } NMSettingSerialParity;
 
-#define NM_SETTING_SERIAL_BAUD "baud"
-#define NM_SETTING_SERIAL_BITS "bits"
-#define NM_SETTING_SERIAL_PARITY "parity"
-#define NM_SETTING_SERIAL_STOPBITS "stopbits"
+#define NM_SETTING_SERIAL_BAUD       "baud"
+#define NM_SETTING_SERIAL_BITS       "bits"
+#define NM_SETTING_SERIAL_PARITY     "parity"
+#define NM_SETTING_SERIAL_STOPBITS   "stopbits"
 #define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 
 /**
@@ -50,24 +53,24 @@ typedef enum {
  * Serial Link Settings
  */
 struct _NMSettingSerial {
-	NMSetting parent;
+    NMSetting parent;
 };
 
 typedef struct {
-	NMSettingClass parent;
+    NMSettingClass parent;
 
-	/*< private >*/
-	gpointer padding[4];
+    /*< private >*/
+    gpointer padding[4];
 } NMSettingSerialClass;
 
-GType nm_setting_serial_get_type (void);
+GType nm_setting_serial_get_type(void);
 
-NMSetting             *nm_setting_serial_new            (void);
-guint                  nm_setting_serial_get_baud       (NMSettingSerial *setting);
-guint                  nm_setting_serial_get_bits       (NMSettingSerial *setting);
-NMSettingSerialParity  nm_setting_serial_get_parity     (NMSettingSerial *setting);
-guint                  nm_setting_serial_get_stopbits   (NMSettingSerial *setting);
-guint64                nm_setting_serial_get_send_delay (NMSettingSerial *setting);
+NMSetting *           nm_setting_serial_new(void);
+guint                 nm_setting_serial_get_baud(NMSettingSerial *setting);
+guint                 nm_setting_serial_get_bits(NMSettingSerial *setting);
+NMSettingSerialParity nm_setting_serial_get_parity(NMSettingSerial *setting);
+guint                 nm_setting_serial_get_stopbits(NMSettingSerial *setting);
+guint64               nm_setting_serial_get_send_delay(NMSettingSerial *setting);
 
 G_END_DECLS