diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2008-04-26 14:32:47 -0700 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2008-04-26 14:32:47 -0700 |
commit | e0705b2735d4e172e74449be8a1181d03250e752 (patch) | |
tree | fb1ab81e25dc6a0cf486e2bf24c6bf386e7b6b08 /lib | |
parent | ee5bfc7b0546bf6918b3c06bdb2fd711702a7eb1 (diff) | |
parent | b8a0a67d69a7aaa3923071e252195ba66e1d0e58 (diff) |
Merge branch 'master' into deps
Conflicts:
lib/initd-list.c
lib/initd.h
Diffstat (limited to 'lib')
-rw-r--r-- | lib/initd-list.c | 15 | ||||
-rw-r--r-- | lib/initd.c | 4 | ||||
-rw-r--r-- | lib/initd.h | 24 |
3 files changed, 24 insertions, 19 deletions
diff --git a/lib/initd-list.c b/lib/initd-list.c index 427817a..17eddc4 100644 --- a/lib/initd-list.c +++ b/lib/initd-list.c @@ -139,7 +139,7 @@ out: return ilp; } -initd_list_t *initd_list_copy(initd_list_t *source) +initd_list_t *initd_list_copy(const initd_list_t *source) { initd_t *iold, *inew; initd_list_t *dest = initd_list_new(); @@ -156,7 +156,7 @@ out: return dest; } -initd_t *initd_list_find_name(initd_list_t *ilp, const char *name) +initd_t *initd_list_find_name(const initd_list_t *ilp, const char *name) { initd_t *ip = NULL; @@ -173,7 +173,7 @@ out: /* Return an initd from a list that provides the given service. Returns * NULL when not found. */ -initd_t *initd_list_find_provides(initd_list_t *ilp, const char *serv) +initd_t *initd_list_find_provides(const initd_list_t *ilp, const char *serv) { initd_t *cur; @@ -190,7 +190,7 @@ err: } /* Verify that a given named initd exists in the list. */ -bool initd_list_exists_name(initd_list_t *ilp, const char *name) +bool initd_list_exists_name(const initd_list_t *ilp, const char *name) { if (initd_list_find_name(ilp, name)) return true; @@ -199,7 +199,7 @@ bool initd_list_exists_name(initd_list_t *ilp, const char *name) } /* Find whether a given service is provided by any script in the list. */ -bool initd_list_provides(initd_list_t *ilp, const char *serv) +bool initd_list_provides(const initd_list_t *ilp, const char *serv) { if (initd_list_find_provides(ilp, serv)) return true; @@ -209,7 +209,8 @@ bool initd_list_provides(initd_list_t *ilp, const char *serv) /* Given an initd, verify that all the Required-Start scripts exist in * the supplied list. */ -char *initd_verify_deps(initd_list_t *ilp, initd_t *ip, initd_key_t key) +char *initd_verify_deps(const initd_list_t *ilp, const initd_t *ip, + initd_key_t key) { dep_t *type; char *missing = NULL; @@ -254,7 +255,7 @@ out: * list as their own initd. Returns NULL if all the deps have been found * or the name of the first missing dep if not. */ -char *initd_list_verify_all(initd_list_t *ilp) +char *initd_list_verify_all(const initd_list_t *ilp) { char *missing = NULL; initd_t *cur; diff --git a/lib/initd.c b/lib/initd.c index 1428016..41fded6 100644 --- a/lib/initd.c +++ b/lib/initd.c @@ -52,7 +52,7 @@ void initd_free(initd_t *ip) ip = NULL; } -initd_t *initd_copy(initd_t *source) +initd_t *initd_copy(const initd_t *source) { initd_t *dest; char *name; @@ -145,7 +145,7 @@ void initd_add_desc(initd_t *ip, const char *ext) } /* Find whether a given service is provided by an initd. */ -bool initd_provides(initd_t *ip, const char *serv) +bool initd_provides(const initd_t *ip, const char *serv) { bool found = false; int n; diff --git a/lib/initd.h b/lib/initd.h index c999eb3..13f7a84 100644 --- a/lib/initd.h +++ b/lib/initd.h @@ -15,7 +15,7 @@ extern initd_t *initd_new(const char *name); extern void initd_free(initd_t *ip); -extern initd_t *initd_copy(initd_t *source); +extern initd_t *initd_copy(const initd_t *source); extern initd_t *initd_parse(const char *path); /* Setters */ @@ -38,18 +38,22 @@ extern void initd_list_add(initd_list_t *ilp, initd_t *ip); extern void initd_list_pop(initd_list_t *ilp); extern initd_list_t *initd_list_from_dir(const char *dir); extern void initd_list_set_actives(initd_list_t *ilp, const char *dir); -extern initd_list_t *initd_list_copy(initd_list_t *source); -extern initd_t *initd_list_find_name(initd_list_t *ilp, const char *name); -extern initd_t *initd_list_find_provides(initd_list_t *ilp, const char *serv); +extern initd_list_t *initd_list_copy(const initd_list_t *source); +extern initd_t *initd_list_find_name(const initd_list_t *ilp, + const char *name); +extern initd_t *initd_list_find_provides(const initd_list_t *ilp, + const char *serv); /* Verification */ -extern bool initd_list_exists_name(initd_list_t *ilp, const char *name); -extern bool initd_provides(initd_t *ip, const char *serv); -extern bool initd_list_provides(initd_list_t *ilp, const char *serv); +extern bool initd_list_exists_name(const initd_list_t *ilp, + const char *name); +extern bool initd_provides(const initd_t *ip, const char *serv); +extern bool initd_list_provides(const initd_list_t *ilp, + const char *serv); extern bool initd_is_active(const initd_t *ip, initd_rc_t rc, initd_sk_t sk); -extern char *initd_verify_deps(initd_list_t *ilp, initd_t *ip, - initd_key_t key); -extern char *initd_list_verify_all(initd_list_t *ilp); +extern char *initd_verify_deps(const initd_list_t *ilp, + const initd_t *ip, initd_key_t key); +extern char *initd_list_verify_all(const initd_list_t *ilp); #endif /* _initd_h_ */ |