From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Sat, 29 Nov 2014 23:37:16 +0000 (+0100)
Subject: util: don't shadow variable
X-Git-Tag: v218~133
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e706d931e0f5741d57c6f3752b4e3520f90f47d5;ds=sidebyside

util: don't shadow variable

environ is already defined in unistd.h
---

diff --git a/src/shared/util.c b/src/shared/util.c
index 4fcbab97b..f01cdd745 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -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;