summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-12-04 17:31:07 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-12-04 17:31:07 -0500
commita0d05ead08a9dd4b0432889f10f41c53966dc13f (patch)
treeec2970832ebe0bc460303d936a4b9cbc851ab314
parent5bdf5509a059c113a0b5f58383ebeeb8fc644cda (diff)
util: don't shadow variable
environ is already defined in unistd.h Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/shared/util.c6
1 files changed, 3 insertions, 3 deletions
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;