[Qemu-devel] [PATCH 1/4] util/envlist: Properly forward a callback's error in envlist_parse.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <address@hidden>
---
 util/envlist.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git util/envlist.c util/envlist.c
index ebc06cf..cbbf7e5 100644
--- util/envlist.c
+++ util/envlist.c
@@ -109,9 +109,10 @@ envlist_parse(envlist_t *envlist, const char *env,
 
        envvar = strtok_r(tmpenv, ",", &envsave);
        while (envvar != NULL) {
-               if ((*callback)(envlist, envvar) != 0) {
+               int err;
+               if ((err = (*callback)(envlist, envvar)) != 0) {
                        free(tmpenv);
-                       return (errno);
+                       return (err);
                }
                envvar = strtok_r(NULL, ",", &envsave);
        }
-- 
1.7.10.4