all: reformat all with new clang-format style

Run:

    ./contrib/scripts/nm-code-format.sh -i
    ./contrib/scripts/nm-code-format.sh -i

Yes, it needs to run twice because the first run doesn't yet produce the
final result.

Signed-off-by: Antonio Cardace <acardace@redhat.com>

1 files changed, 50 insertions, 47 deletions

diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h
index c3240cc92f..7a5ec2723a 100644
--- a/libnm-core/nm-setting-vxlan.h
+++ b/libnm-core/nm-setting-vxlan.h
@@ -6,39 +6,42 @@
 #ifndef __NM_SETTING_VXLAN_H__
 #define __NM_SETTING_VXLAN_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_VXLAN            (nm_setting_vxlan_get_type ())
-#define NM_SETTING_VXLAN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VXLAN, NMSettingVxlan))
-#define NM_SETTING_VXLAN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VXLANCONFIG, NMSettingVxlanClass))
-#define NM_IS_SETTING_VXLAN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VXLAN))
-#define NM_IS_SETTING_VXLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_VXLAN))
-#define NM_SETTING_VXLAN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VXLAN, NMSettingVxlanClass))
+#define NM_TYPE_SETTING_VXLAN (nm_setting_vxlan_get_type())
+#define NM_SETTING_VXLAN(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_VXLAN, NMSettingVxlan))
+#define NM_SETTING_VXLAN_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_VXLANCONFIG, NMSettingVxlanClass))
+#define NM_IS_SETTING_VXLAN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_VXLAN))
+#define NM_IS_SETTING_VXLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_VXLAN))
+#define NM_SETTING_VXLAN_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_VXLAN, NMSettingVxlanClass))
 
-#define NM_SETTING_VXLAN_SETTING_NAME       "vxlan"
+#define NM_SETTING_VXLAN_SETTING_NAME "vxlan"
 
-#define NM_SETTING_VXLAN_PARENT             "parent"
-#define NM_SETTING_VXLAN_ID                 "id"
-#define NM_SETTING_VXLAN_LOCAL              "local"
-#define NM_SETTING_VXLAN_REMOTE             "remote"
-#define NM_SETTING_VXLAN_SOURCE_PORT_MIN    "source-port-min"
-#define NM_SETTING_VXLAN_SOURCE_PORT_MAX    "source-port-max"
-#define NM_SETTING_VXLAN_DESTINATION_PORT   "destination-port"
-#define NM_SETTING_VXLAN_TOS                "tos"
-#define NM_SETTING_VXLAN_TTL                "ttl"
-#define NM_SETTING_VXLAN_AGEING             "ageing"
-#define NM_SETTING_VXLAN_LIMIT              "limit"
-#define NM_SETTING_VXLAN_PROXY              "proxy"
-#define NM_SETTING_VXLAN_LEARNING           "learning"
-#define NM_SETTING_VXLAN_RSC                "rsc"
-#define NM_SETTING_VXLAN_L2_MISS            "l2-miss"
-#define NM_SETTING_VXLAN_L3_MISS            "l3-miss"
+#define NM_SETTING_VXLAN_PARENT           "parent"
+#define NM_SETTING_VXLAN_ID               "id"
+#define NM_SETTING_VXLAN_LOCAL            "local"
+#define NM_SETTING_VXLAN_REMOTE           "remote"
+#define NM_SETTING_VXLAN_SOURCE_PORT_MIN  "source-port-min"
+#define NM_SETTING_VXLAN_SOURCE_PORT_MAX  "source-port-max"
+#define NM_SETTING_VXLAN_DESTINATION_PORT "destination-port"
+#define NM_SETTING_VXLAN_TOS              "tos"
+#define NM_SETTING_VXLAN_TTL              "ttl"
+#define NM_SETTING_VXLAN_AGEING           "ageing"
+#define NM_SETTING_VXLAN_LIMIT            "limit"
+#define NM_SETTING_VXLAN_PROXY            "proxy"
+#define NM_SETTING_VXLAN_LEARNING         "learning"
+#define NM_SETTING_VXLAN_RSC              "rsc"
+#define NM_SETTING_VXLAN_L2_MISS          "l2-miss"
+#define NM_SETTING_VXLAN_L3_MISS          "l3-miss"
 
 /**
  * NMSettingVxlan:
@@ -46,52 +49,52 @@ G_BEGIN_DECLS
  * VXLAN Settings
  */
 struct _NMSettingVxlan {
-	NMSetting parent;
+    NMSetting parent;
 };
 
 typedef struct {
-	NMSettingClass parent;
+    NMSettingClass parent;
 
-	/*< private >*/
-	gpointer padding[4];
+    /*< private >*/
+    gpointer padding[4];
 } NMSettingVxlanClass;
 
 NM_AVAILABLE_IN_1_2
-GType       nm_setting_vxlan_get_type             (void);
+GType nm_setting_vxlan_get_type(void);
 NM_AVAILABLE_IN_1_2
-NMSetting  *nm_setting_vxlan_new                  (void);
+NMSetting *nm_setting_vxlan_new(void);
 NM_AVAILABLE_IN_1_2
-const char *nm_setting_vxlan_get_parent           (NMSettingVxlan *setting);
+const char *nm_setting_vxlan_get_parent(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_id               (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_id(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-const char *nm_setting_vxlan_get_local            (NMSettingVxlan *setting);
+const char *nm_setting_vxlan_get_local(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-const char *nm_setting_vxlan_get_remote           (NMSettingVxlan *setting);
+const char *nm_setting_vxlan_get_remote(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_source_port_min  (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_source_port_min(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_source_port_max  (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_source_port_max(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_destination_port (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_destination_port(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_tos              (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_tos(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_ttl              (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_ttl(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_ageing           (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_ageing(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-guint       nm_setting_vxlan_get_limit            (NMSettingVxlan *setting);
+guint nm_setting_vxlan_get_limit(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-gboolean    nm_setting_vxlan_get_proxy            (NMSettingVxlan *setting);
+gboolean nm_setting_vxlan_get_proxy(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-gboolean    nm_setting_vxlan_get_learning         (NMSettingVxlan *setting);
+gboolean nm_setting_vxlan_get_learning(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-gboolean    nm_setting_vxlan_get_rsc              (NMSettingVxlan *setting);
+gboolean nm_setting_vxlan_get_rsc(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-gboolean    nm_setting_vxlan_get_l2_miss          (NMSettingVxlan *setting);
+gboolean nm_setting_vxlan_get_l2_miss(NMSettingVxlan *setting);
 NM_AVAILABLE_IN_1_2
-gboolean    nm_setting_vxlan_get_l3_miss          (NMSettingVxlan *setting);
+gboolean nm_setting_vxlan_get_l3_miss(NMSettingVxlan *setting);
 
 G_END_DECLS