diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2016-01-01 13:13:28 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2016-01-01 13:13:28 -0600 |
| commit | 981d2b3308edb0d0a68f7bdce4f2c99110de6940 (patch) | |
| tree | 2bc2eb2f2a3fdbe008cf5dd0d8940dcdbfe5f4d0 /src/rc | |
| parent | 5d3e85bc310e12411135e98a397b35fb920a72a3 (diff) | |
rc: clean up compiler warnings
The get_systype(), detect_container(), detect_prefix() and detect_vm()
functions need to return "char *" instead of "const char *".
Diffstat (limited to 'src/rc')
| -rw-r--r-- | src/rc/_usage.c | 2 | ||||
| -rw-r--r-- | src/rc/rc-misc.c | 10 | ||||
| -rw-r--r-- | src/rc/rc.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/rc/_usage.c b/src/rc/_usage.c index e190eb40..b5f664a7 100644 --- a/src/rc/_usage.c +++ b/src/rc/_usage.c @@ -40,7 +40,7 @@ static void set_quiet_options(void) _noreturn static void show_version(void) { - const char *systype = NULL; + char *systype = NULL; printf("%s (OpenRC", applet); systype = detect_container(); diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c index f1dad3bc..bb401e13 100644 --- a/src/rc/rc-misc.c +++ b/src/rc/rc-misc.c @@ -126,7 +126,7 @@ env_config(void) char *np; char *npp; char *tok; - const char *sys = NULL; + char *sys = NULL; char buffer[PATH_MAX]; /* Ensure our PATH is prefixed with the system locations first @@ -380,7 +380,7 @@ found: return retval; } -const char *detect_prefix(void) +char *detect_prefix(void) { #ifdef PREFIX return RC_SYS_PREFIX; @@ -389,7 +389,7 @@ const char *detect_prefix(void) #endif } -const char *get_systype(void) +char *get_systype(void) { char *systype = rc_conf_value("rc_sys"); if (systype) { @@ -404,7 +404,7 @@ const char *get_systype(void) return systype; } -const char *detect_container(void) +char *detect_container(void) { char *systype = get_systype(); @@ -459,7 +459,7 @@ const char *detect_container(void) return NULL; } -const char *detect_vm(void) +char *detect_vm(void) { char *systype = get_systype(); diff --git a/src/rc/rc.c b/src/rc/rc.c index a0b18865..64541e07 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -261,7 +261,7 @@ open_shell(void) struct passwd *pw; #ifdef __linux__ - const char *sys = NULL; + char *sys = NULL; sys = detect_container(); if (!sys) @@ -450,7 +450,7 @@ static void do_sysinit() { struct utsname uts; - const char *sys; + char *sys; /* exec init-early.sh if it exists * This should just setup the console to use the correct @@ -749,7 +749,7 @@ main(int argc, char **argv) { const char *bootlevel = NULL; char *newlevel = NULL; - const char *systype = NULL; + char *systype = NULL; static RC_STRINGLIST *hotplugged_services; static RC_STRINGLIST *stop_services; static RC_STRINGLIST *start_services; |