Merge branch 'debian/master' into ubuntu/master

1 files changed, 15 insertions, 16 deletions

diff --git a/src/devices/nm-acd-manager.h b/src/devices/nm-acd-manager.h
index 4afe509d..21001c74 100644
--- a/src/devices/nm-acd-manager.h
+++ b/src/devices/nm-acd-manager.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 - 2018 Red Hat, Inc.
  */
@@ -11,25 +11,24 @@
 typedef struct _NMAcdManager NMAcdManager;
 
 typedef struct {
-	void (*probe_terminated_callback) (NMAcdManager *self,
-	                                   gpointer user_data);
-	GDestroyNotify user_data_destroy;
+    void (*probe_terminated_callback)(NMAcdManager *self, gpointer user_data);
+    GDestroyNotify user_data_destroy;
 } NMAcdCallbacks;
 
-NMAcdManager *nm_acd_manager_new (int ifindex,
-                                  const guint8 *hwaddr,
-                                  guint hwaddr_len,
-                                  const NMAcdCallbacks *callbacks,
-                                  gpointer user_data);
+NMAcdManager *nm_acd_manager_new(int                   ifindex,
+                                 const guint8 *        hwaddr,
+                                 guint                 hwaddr_len,
+                                 const NMAcdCallbacks *callbacks,
+                                 gpointer              user_data);
 
-void nm_acd_manager_free (NMAcdManager *self);
+void nm_acd_manager_free(NMAcdManager *self);
 
-gboolean nm_acd_manager_add_address (NMAcdManager *self, in_addr_t address);
-int nm_acd_manager_start_probe (NMAcdManager *self, guint timeout);
-gboolean nm_acd_manager_check_address (NMAcdManager *self, in_addr_t address);
-int nm_acd_manager_announce_addresses (NMAcdManager *self);
+gboolean nm_acd_manager_add_address(NMAcdManager *self, in_addr_t address);
+int      nm_acd_manager_start_probe(NMAcdManager *self, guint timeout);
+gboolean nm_acd_manager_check_address(NMAcdManager *self, in_addr_t address);
+int      nm_acd_manager_announce_addresses(NMAcdManager *self);
 
-NM_AUTO_DEFINE_FCN0 (NMAcdManager *, _nm_auto_free_acdmgr, nm_acd_manager_free);
-#define nm_auto_free_acdmgr nm_auto (_nm_auto_free_acdmgr)
+NM_AUTO_DEFINE_FCN0(NMAcdManager *, _nm_auto_free_acdmgr, nm_acd_manager_free);
+#define nm_auto_free_acdmgr nm_auto(_nm_auto_free_acdmgr)
 
 #endif /* __NM_ACD_MANAGER__ */