Merge branch 'debian/master' into ubuntu/master

1 files changed, 15 insertions, 14 deletions

diff --git a/src/nm-dhcp-config.h b/src/nm-dhcp-config.h
index da192e77..dbd0b5e7 100644
--- a/src/nm-dhcp-config.h
+++ b/src/nm-dhcp-config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2008 Red Hat, Inc.
  */
@@ -8,28 +8,29 @@
 
 /*****************************************************************************/
 
-#define NM_TYPE_DHCP_CONFIG            (nm_dhcp_config_get_type ())
-#define NM_DHCP_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CONFIG, NMDhcpConfig))
-#define NM_DHCP_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CONFIG, NMDhcpConfigClass))
-#define NM_IS_DHCP_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CONFIG))
-#define NM_IS_DHCP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CONFIG))
-#define NM_DHCP_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CONFIG, NMDhcpConfigClass))
+#define NM_TYPE_DHCP_CONFIG (nm_dhcp_config_get_type())
+#define NM_DHCP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_CONFIG, NMDhcpConfig))
+#define NM_DHCP_CONFIG_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_CONFIG, NMDhcpConfigClass))
+#define NM_IS_DHCP_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_CONFIG))
+#define NM_IS_DHCP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_CONFIG))
+#define NM_DHCP_CONFIG_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_CONFIG, NMDhcpConfigClass))
 
 #define NM_DHCP_CONFIG_OPTIONS "options"
 
 typedef struct _NMDhcpConfigClass NMDhcpConfigClass;
 
-GType nm_dhcp_config_get_type (void);
+GType nm_dhcp_config_get_type(void);
 
-NMDhcpConfig *nm_dhcp_config_new (int addr_family);
+NMDhcpConfig *nm_dhcp_config_new(int addr_family);
 
-int nm_dhcp_config_get_addr_family (NMDhcpConfig *self);
+int nm_dhcp_config_get_addr_family(NMDhcpConfig *self);
 
-void nm_dhcp_config_set_options (NMDhcpConfig *self,
-                                 GHashTable *options);
+void nm_dhcp_config_set_options(NMDhcpConfig *self, GHashTable *options);
 
-const char *nm_dhcp_config_get_option (NMDhcpConfig *self, const char *option);
+const char *nm_dhcp_config_get_option(NMDhcpConfig *self, const char *option);
 
-GVariant *nm_dhcp_config_get_options (NMDhcpConfig *self);
+GVariant *nm_dhcp_config_get_options(NMDhcpConfig *self);
 
 #endif /* __NM_DHCP_CONFIG_H__ */