From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Nov 2013 18:32:33 +0000 (+0100)
Subject: hostnamed: modernizations
X-Git-Tag: v209~1355
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0ccad099d4c08dc5a16c87cdd6eefc05e9d4b670;hp=9d5a3757c3e5bc2266053dbadb4a542a6dd5e7b8;p=elogind.git

hostnamed: modernizations
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 332c00bee..c874ea2f6 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -266,7 +266,7 @@ static int context_write_data_other(Context *c) {
                 [PROP_CHASSIS] = "CHASSIS"
         };
 
-        char **l = NULL;
+        _cleanup_strv_free_ char **l = NULL;
         int r, p;
 
         assert(c);
@@ -285,17 +285,16 @@ static int context_write_data_other(Context *c) {
                         continue;
                 }
 
-                if (asprintf(&t, "%s=%s", name[p], strempty(c->data[p])) < 0) {
-                        strv_free(l);
+                if (asprintf(&t, "%s=%s", name[p], strempty(c->data[p])) < 0)
                         return -ENOMEM;
-                }
 
                 u = strv_env_set(l, t);
                 free(t);
-                strv_free(l);
 
                 if (!u)
                         return -ENOMEM;
+
+                strv_free(l);
                 l = u;
         }
 
@@ -307,10 +306,7 @@ static int context_write_data_other(Context *c) {
                 return 0;
         }
 
-        r = write_env_file_label("/etc/machine-info", l);
-        strv_free(l);
-
-        return r;
+        return write_env_file_label("/etc/machine-info", l);
 }
 
 static int property_get_icon_name(