emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc: clean up compiler warnings

Browse Source 
The get_systype(), detect_container(), detect_prefix() and detect_vm()
functions need to return "char *" instead of "const char *".
This commit is contained in:
William Hubbs 2016-01-01 13:13:28 -06:00
parent 5d3e85bc31
commit 981d2b3308
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/includes/rc-misc.h
View File

@ -74,8 +74,8 @@ int is_writable(const char *);
#define service_stop(service) exec_service(service, "stop"); #define service_stop(service) exec_service(service, "stop");
int parse_mode(mode_t *, char *); int parse_mode(mode_t *, char *);
const char *detect_prefix(void); char *detect_prefix(void);
const char *get_systype(void); char *get_systype(void);
const char *detect_container(void); char *detect_container(void);
const char *detect_vm(void); char *detect_vm(void);
#endif #endif

2
src/rc/_usage.c
View File

@ -40,7 +40,7 @@ static void set_quiet_options(void)
_noreturn static void _noreturn static void
show_version(void) show_version(void)
{ {
const char *systype = NULL; char *systype = NULL;
printf("%s (OpenRC", applet); printf("%s (OpenRC", applet);
systype = detect_container(); systype = detect_container();

10
src/rc/rc-misc.c
View File

@ -126,7 +126,7 @@ env_config(void)
char *np; char *np;
char *npp; char *npp;
char *tok; char *tok;
const char *sys = NULL; char *sys = NULL;
char buffer[PATH_MAX]; char buffer[PATH_MAX];
/* Ensure our PATH is prefixed with the system locations first /* Ensure our PATH is prefixed with the system locations first
@ -380,7 +380,7 @@ found:
return retval; return retval;
} }
const char *detect_prefix(void) char *detect_prefix(void)
{ {
#ifdef PREFIX #ifdef PREFIX
return RC_SYS_PREFIX; return RC_SYS_PREFIX;
@ -389,7 +389,7 @@ const char *detect_prefix(void)
#endif #endif
} }
const char *get_systype(void) char *get_systype(void)
{ {
char *systype = rc_conf_value("rc_sys"); char *systype = rc_conf_value("rc_sys");
if (systype) { if (systype) {
@ -404,7 +404,7 @@ const char *get_systype(void)
return systype; return systype;
} }
const char *detect_container(void) char *detect_container(void)
{ {
char *systype = get_systype(); char *systype = get_systype();
@ -459,7 +459,7 @@ const char *detect_container(void)
return NULL; return NULL;
} }
const char *detect_vm(void) char *detect_vm(void)
{ {
char *systype = get_systype(); char *systype = get_systype();

6
src/rc/rc.c
View File

@ -261,7 +261,7 @@ open_shell(void)
struct passwd *pw; struct passwd *pw;
#ifdef __linux__ #ifdef __linux__
const char *sys = NULL; char *sys = NULL;
sys = detect_container(); sys = detect_container();
if (!sys) if (!sys)
@ -450,7 +450,7 @@ static void
do_sysinit() do_sysinit()
{ {
struct utsname uts; struct utsname uts;
const char *sys; char *sys;
/* exec init-early.sh if it exists /* exec init-early.sh if it exists
* This should just setup the console to use the correct * This should just setup the console to use the correct
@ -749,7 +749,7 @@ main(int argc, char **argv)
{ {
const char *bootlevel = NULL; const char *bootlevel = NULL;
char *newlevel = NULL; char *newlevel = NULL;
const char *systype = NULL; char *systype = NULL;
static RC_STRINGLIST *hotplugged_services; static RC_STRINGLIST *hotplugged_services;
static RC_STRINGLIST *stop_services; static RC_STRINGLIST *stop_services;
static RC_STRINGLIST *start_services; static RC_STRINGLIST *start_services;