picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: don't shadow variable

Browse source 
environ is already defined in unistd.h
This commit is contained in:
Thomas Hindoe Paaboel Andersen 2014-11-30 00:37:16 +01:00
parent 77209c3505
commit e706d931e0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/shared/util.c
View file

@ -955,7 +955,7 @@ int get_process_root(pid_t pid, char **root) {
return get_process_link_contents(p, root);
}
int get_process_environ(pid_t pid, char **environ) {
int get_process_environ(pid_t pid, char **env) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *outcome = NULL;
int c;
@ -963,7 +963,7 @@ int get_process_environ(pid_t pid, char **environ) {
size_t allocated = 0, sz = 0;
assert(pid >= 0);
assert(environ);
assert(env);
p = procfs_file_alloca(pid, "environ");
@ -982,7 +982,7 @@ int get_process_environ(pid_t pid, char **environ) {
}
outcome[sz] = '\0';
*environ = outcome;
*env = outcome;
outcome = NULL;
return 0;