Refactor: lib/services: unify/add include guards for *.h

(wild guess has it that MH stood for long-dead Matahari project)
jnpkrn · Feb 9, 2017 · ef711f9 · ef711f9
1 parent fdb53ab
commit ef711f9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/lib/services/pcmk-dbus.h b/lib/services/pcmk-dbus.h
@@ -8,9 +8,9 @@
 #ifndef PCMK_DBUS__H
 #  define PCMK_DBUS__H
 
-#ifndef DBUS_TIMEOUT_USE_DEFAULT
-#  define DBUS_TIMEOUT_USE_DEFAULT -1
-#endif
+#  ifndef DBUS_TIMEOUT_USE_DEFAULT
+#    define DBUS_TIMEOUT_USE_DEFAULT -1
+#  endif
 
 DBusConnection *pcmk_dbus_connect(void);
 void pcmk_dbus_connection_setup_with_select(DBusConnection *c);
@@ -28,4 +28,4 @@ char *pcmk_dbus_get_property(
 bool pcmk_dbus_find_error(DBusPendingCall *pending, DBusMessage *reply,
                           DBusError *error);
 
-#endif /* PCMK_DBUS__H */
+#endif  /* PCMK_DBUS__H */
diff --git a/lib/services/services_private.h b/lib/services/services_private.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MH_SERVICES_PRIVATE_H__
-#  define __MH_SERVICES_PRIVATE_H__
+#ifndef SERVICES_PRIVATE__H
+#  define SERVICES_PRIVATE__H
 
 #if SUPPORT_DBUS
 #  include <dbus/dbus.h>
@@ -69,4 +69,4 @@ gboolean is_op_blocked(const char *rsc);
 void services_set_op_pending(svc_action_t *op, DBusPendingCall *pending);
 #endif
 
-#endif                          /* __MH_SERVICES_PRIVATE_H__ */
+#endif  /* SERVICES_PRIVATE__H */
diff --git a/lib/services/systemd.h b/lib/services/systemd.h
@@ -16,8 +16,13 @@
  * Copyright (C) 2012 Andrew Beekhof <[email protected]>
  */
 
+#ifndef SYSTEMD__H
+#  define SYSTEMD__H
+
 G_GNUC_INTERNAL GList *systemd_unit_listall(void);
 G_GNUC_INTERNAL int systemd_unit_exec(svc_action_t * op);
 G_GNUC_INTERNAL gboolean systemd_unit_exists(const gchar * name);
 G_GNUC_INTERNAL gboolean systemd_unit_running(const gchar * name);
 G_GNUC_INTERNAL void systemd_cleanup(void);
+
+#endif  /* SYSTEMD__H */
diff --git a/lib/services/upstart.h b/lib/services/upstart.h
@@ -13,12 +13,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * File: upstart-dbus.c
  * Copyright (C) 2010 Senko Rasic <[email protected]>
  * Copyright (c) 2010 Ante Karamatic <[email protected]>
  */
-#ifndef _UPSTART_DBUS_H_
-#  define _UPSTART_DBUS_H_
+#ifndef UPSTART__H
+#  define UPSTART__H
 
 #  include <glib.h>
 #  include "crm/services.h"
@@ -29,4 +28,4 @@ G_GNUC_INTERNAL gboolean upstart_job_exists(const gchar * name);
 G_GNUC_INTERNAL gboolean upstart_job_running(const gchar * name);
 G_GNUC_INTERNAL void upstart_cleanup(void);
 
-#endif                          /* _UPSTART_DBUS_H_ */
+#endif  /* UPSTART__H */