summaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-09-21 01:51:23 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-21 01:51:23 +0200
commitce8a6aa1a0934d7377b8c7af185149e4627512b6 (patch)
tree5d6d5ed566d83db1780790343f8a0364bef9fca6 /src/util.c
parent8780d48d86d921a8245febdde7888cd89ad3631b (diff)
locale: make sure we don't merge configuration settings from different sources
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.c b/src/util.c
index bdc194e80c..0939ea9456 100644
--- a/src/util.c
+++ b/src/util.c
@@ -602,7 +602,7 @@ int parse_env_file(
const char *fname,
const char *seperator, ...) {
- int r;
+ int r = 0;
char *contents, *p;
assert(fname);
@@ -657,6 +657,8 @@ int parse_env_file(
*value = v;
p += n;
+
+ r ++;
break;
}
va_end(ap);
@@ -666,8 +668,6 @@ int parse_env_file(
p += strcspn(p, seperator);
}
- r = 0;
-
fail:
free(contents);
return r;