shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

activate: avoid warning from -Wshadow

Browse Source 
src/activate/activate.c:167:51: warning: declaration shadows a variable in the global scope [-Wshadow]
static int launch(char* name, char **argv, char **environ, int fds) {
                                                  ^
/usr/include/unistd.h:546:15: note: previous declaration is here
extern char **environ;
              ^
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-20 18:30:31 -04:00
parent 131c01dbe9
commit 23ea3dab15
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/activate/activate.c
View File

@ -164,7 +164,7 @@ static int open_sockets(int *epoll_fd, bool accept) {
return count;
}
static int launch(char* name, char **argv, char **environ, int fds) {
static int launch(char* name, char **argv, char **env, int fds) {
unsigned n_env = 0, length;
char **envp = NULL, **s;
static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
@ -182,14 +182,14 @@ static int launch(char* name, char **argv, char **environ, int fds) {
char _cleanup_free_ *p = strappend(*s, "=");
if (!p)
return log_oom();
envp[n_env] = strv_find_prefix(environ, p);
envp[n_env] = strv_find_prefix(env, p);
if (envp[n_env])
n_env ++;
}
}
for (i = 0; i < ELEMENTSOF(tocopy); i++) {
envp[n_env] = strv_find_prefix(environ, tocopy[i]);
envp[n_env] = strv_find_prefix(env, tocopy[i]);
if (envp[n_env])
n_env ++;
}
@ -208,7 +208,7 @@ static int launch(char* name, char **argv, char **environ, int fds) {
return -errno;
}
static int launch1(const char* child, char** argv, char **environ, int fd) {
static int launch1(const char* child, char** argv, char **env, int fd) {
pid_t parent_pid, child_pid;
int r;