From a0d05ead08a9dd4b0432889f10f41c53966dc13f Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Thu, 4 Dec 2014 17:31:07 -0500 Subject: util: don't shadow variable environ is already defined in unistd.h Signed-off-by: Anthony G. Basile --- src/shared/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/shared/util.c b/src/shared/util.c index 23ecb1b462..1b9edad70c 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -409,7 +409,7 @@ char *truncate_nl(char *s) { return s; } -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; @@ -417,7 +417,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"); @@ -436,7 +436,7 @@ int get_process_environ(pid_t pid, char **environ) { } outcome[sz] = '\0'; - *environ = outcome; + *env = outcome; outcome = NULL; return 0; -- cgit v1.2.3-54-g00ecf