Rename libinitd headers with initd- prefix to avoid conflicts

Since the libinitd headers are used throughout the tree, we want to
avoid naming conflicts, such as util.h.

17 files changed, 41 insertions, 41 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b88925a..af497a8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES = libinitd.la
-libinitd_la_SOURCES = str.h str.c strarg.c types.h parse.c active.c \
-	initd.h initd.c initd-list.c rdep.h rdep.c util.h util.c \
-	installrm.h installrm.c
+libinitd_la_SOURCES = initd-str.h str.c strarg.c initd-types.h parse.c \
+	active.c initd.h initd.c initd-list.c initd-rdep.h rdep.c \
+	initd-rcint.h initd-util.h util.c initd-installrm.h installrm.c
diff --git a/lib/active.c b/lib/active.c
index 2cc76d9..927332c 100644
--- a/lib/active.c
+++ b/lib/active.c
@@ -13,8 +13,8 @@
 #include <errno.h>
 #include <string.h>
 #include "initd.h"
-#include "str.h"
-#include "rcint.h"
+#include "initd-str.h"
+#include "initd-rcint.h"
 
 static bool active_verbose = false;
 static bool read_dir_symlinks(initd_list_t *ilp, const struct rcpair *rcp);
diff --git a/lib/installrm.h b/lib/initd-installrm.h
index e8d744a..2249074 100644
--- a/lib/installrm.h
+++ b/lib/initd-installrm.h
@@ -1,11 +1,11 @@
-#ifndef _installrm_h_
-#define _installrm_h_
+#ifndef _initd_installrm_h_
+#define _initd_installrm_h_
 
 #include <stdbool.h>
-#include "types.h"
+#include "initd-types.h"
 
 extern bool initd_installrm_links(const initd_list_t *ilp,
 				const char *dir, initd_sk_t sk);
 extern void initd_installrm_set_verbose(bool verbose);
 
-#endif /* _installrm_h_ */
+#endif /* _initd_installrm_h_ */
diff --git a/lib/initd-list.c b/lib/initd-list.c
index f49530a..dfdecb7 100644
--- a/lib/initd-list.c
+++ b/lib/initd-list.c
@@ -15,7 +15,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include "initd.h"
-#include "str.h"
+#include "initd-str.h"
 
 initd_list_t *initd_list_new(void)
 {
diff --git a/lib/rcint.h b/lib/initd-rcint.h
index e0c06b8..0ea2536 100644
--- a/lib/rcint.h
+++ b/lib/initd-rcint.h
@@ -1,5 +1,5 @@
-#ifndef _rcint_h_
-#define _rcint_h_
+#ifndef _initd_rcint_h_
+#define _initd_rcint_h_
 
 struct rcpair {
 	char *dir;
@@ -27,4 +27,4 @@ static struct rcpair rcdirs[] = {
 	{ NULL, 0 }
 };
 
-#endif /* _rcint_h_ */
+#endif /* _initd_rcint_h_ */
diff --git a/lib/rdep.h b/lib/initd-rdep.h
index d562be4..eb2d6f4 100644
--- a/lib/rdep.h
+++ b/lib/initd-rdep.h
@@ -1,8 +1,8 @@
-#ifndef _dep_h_
-#define _dep_h_
+#ifndef _initd_rdep_h_
+#define _initd_rdep_h_
 
 #include <stdbool.h>
-#include "types.h"
+#include "initd-types.h"
 
 extern initd_list_t *initd_add_recurse_deps(initd_list_t *pool,
 				initd_sk_t sk, const dep_t *add);
@@ -11,4 +11,4 @@ extern initd_list_t *initd_remove_recurse_deps(initd_list_t *pool,
 extern void initd_recurse_set_verbose(bool verbose);
 extern bool initd_list_verify_deps(const initd_list_t *ord, initd_sk_t sk);
 
-#endif /* _dep_h_ */
+#endif /* _initd_rdep_h_ */
diff --git a/lib/str.h b/lib/initd-str.h
index f9330eb..a870812 100644
--- a/lib/str.h
+++ b/lib/initd-str.h
@@ -1,5 +1,5 @@
-#ifndef _str_h_
-#define _str_h_
+#ifndef _initd_str_h_
+#define _initd_str_h_
 
 #include <stdbool.h>
 
@@ -22,4 +22,4 @@ extern unsigned int strarg_get_num(const strarg_t *sp);
 extern char *strarg_get_str(const strarg_t *sp, unsigned int index);
 extern strarg_t *strarg_copy(const strarg_t *source);
 
-#endif /* _str_h_ */
+#endif /* _initd_str_h_ */
diff --git a/lib/types.h b/lib/initd-types.h
index 451df89..7a8c74c 100644
--- a/lib/types.h
+++ b/lib/initd-types.h
@@ -1,7 +1,7 @@
-#ifndef _types_h_
-#define _types_h_
+#ifndef _initd_types_h_
+#define _initd_types_h_
 
-#include "str.h"
+#include "initd-str.h"
 
 /* keys in the initd type */
 typedef enum initd_key {
@@ -112,4 +112,4 @@ typedef struct initd_list {
 	initd_t *last;
 } initd_list_t;
 
-#endif /* _types_h_ */
+#endif /* _initd_types_h_ */
diff --git a/lib/util.h b/lib/initd-util.h
index e603a0c..68b8d46 100644
--- a/lib/util.h
+++ b/lib/initd-util.h
@@ -1,7 +1,7 @@
-#ifndef _util_h_
-#define _util_h_
+#ifndef _initd_util_h_
+#define _initd_util_h_
 
 extern char *initd_basename(const char *path);
 extern char *initd_dirname(const char *path);
 
-#endif /* _util_h_ */
+#endif /* _initd_util_h_ */
diff --git a/lib/initd.c b/lib/initd.c
index c6f9362..050dc87 100644
--- a/lib/initd.c
+++ b/lib/initd.c
@@ -6,7 +6,7 @@
 #include <error.h>
 #include <errno.h>
 #include "initd.h"
-#include "str.h"
+#include "initd-str.h"
 
 static initd_rc_t *initd_get_rc_from_key(const initd_t *ip,
 					initd_key_t key);
diff --git a/lib/initd.h b/lib/initd.h
index af5eff6..9ecb6ae 100644
--- a/lib/initd.h
+++ b/lib/initd.h
@@ -2,11 +2,11 @@
 #define _initd_h_
 
 #include <stdbool.h>
-#include "str.h"
-#include "types.h"
-#include "util.h"
-#include "rdep.h"
-#include "installrm.h"
+#include "initd-str.h"
+#include "initd-types.h"
+#include "initd-util.h"
+#include "initd-rdep.h"
+#include "initd-installrm.h"
 
 #ifndef DEF_INITD_DIR
 #define DEF_INITD_DIR "/etc/init.d"
diff --git a/lib/installrm.c b/lib/installrm.c
index b803e8b..9ab9fdc 100644
--- a/lib/installrm.c
+++ b/lib/installrm.c
@@ -11,8 +11,8 @@
 #include <string.h>
 #include <limits.h>
 #include <glob.h>
-#include "installrm.h"
-#include "rcint.h"
+#include "initd-installrm.h"
+#include "initd-rcint.h"
 #include "initd.h"
 
 static bool installrm_verbose = false;
diff --git a/lib/parse.c b/lib/parse.c
index 010b10b..32c3950 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include "initd.h"
-#include "util.h"
+#include "initd-util.h"
 
 static FILE *initd_open(const char *path);
 static void initd_close(FILE *ifd);
diff --git a/lib/rdep.c b/lib/rdep.c
index 542f671..9e4c1ab 100644
--- a/lib/rdep.c
+++ b/lib/rdep.c
@@ -6,8 +6,8 @@
 #include <string.h>
 #include <limits.h>
 #include <stdarg.h>
-#include "types.h"
-#include "rdep.h"
+#include "initd-types.h"
+#include "initd-rdep.h"
 #include "initd.h"
 
 static bool rdep_verbose = false;
diff --git a/lib/str.c b/lib/str.c
index e6e03bc..6d1fbe7 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "str.h"
+#include "initd-str.h"
 
 static char *d_string_grow(char *ds, size_t len);
 
diff --git a/lib/strarg.c b/lib/strarg.c
index d8de058..1fb8968 100644
--- a/lib/strarg.c
+++ b/lib/strarg.c
@@ -5,7 +5,7 @@
 #include <error.h>
 #include <errno.h>
 #include <string.h>
-#include "str.h"
+#include "initd-str.h"
 
 strarg_t *strarg_new(void)
 {
diff --git a/lib/util.c b/lib/util.c
index 120b844..838acba 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -6,7 +6,7 @@
 #include <libgen.h>
 #include <error.h>
 #include <errno.h>
-#include "util.h"
+#include "initd-util.h"
 
 /* Wrappers around basename() and dirname() */
 char *initd_basename(const char *path)