From ce8a6aa1a0934d7377b8c7af185149e4627512b6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Sep 2010 01:51:23 +0200
Subject: locale: make sure we don't merge configuration settings from
 different sources

---
 src/util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/util.c')

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;
-- 
cgit v1.2.3-54-g00ecf