From e3e45d4f82daa5cd85ba40dde9127df900096c0c Mon Sep 17 00:00:00 2001
From: Simon Peeters <peeters.simon@gmail.com>
Date: Sat, 4 Jan 2014 02:35:27 +0100
Subject: strv: multiple cleanups

- turn strv_merge into strv_extend_strv.
   appending strv b to the end of strv a instead of creating a new strv
- strv_append: remove in favor of strv_extend and strv_push.
- strv_remove: write slightly more elegant
- strv_remove_prefix: remove unused function
- strv_overlap: use strv_contains
- strv_printf: STRV_FOREACH handles NULL correctly
---
 src/shared/path-lookup.c | 83 ++++++++++++------------------------------------
 1 file changed, 21 insertions(+), 62 deletions(-)

(limited to 'src/shared/path-lookup.c')

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 1a47ea9ce7..e2ca9420d9 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -90,9 +90,9 @@ static char** user_dirs(
         };
 
         const char *home, *e;
-        char *config_home = NULL, *data_home = NULL;
-        char **config_dirs = NULL, **data_dirs = NULL;
-        char **r = NULL, **t;
+        _cleanup_free_ char *config_home = NULL, *data_home = NULL;
+        _cleanup_strv_free_ char **config_dirs = NULL, **data_dirs = NULL;
+        char **r = NULL;
 
         /* Implement the mechanisms defined in
          *
@@ -150,89 +150,48 @@ static char** user_dirs(
                 goto fail;
 
         /* Now merge everything we found. */
-        if (generator_early) {
-                t = strv_append(r, generator_early);
-                if (!t)
+        if (generator_early)
+                if (strv_extend(&r, generator_early) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (config_home) {
-                t = strv_append(r, config_home);
-                if (!t)
+        if (config_home)
+                if (strv_extend(&r, config_home) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (!strv_isempty(config_dirs)) {
-                t = strv_merge_concat(r, config_dirs, "/systemd/user");
-                if (!t)
-                        goto finish;
-                strv_free(r);
-                r = t;
-        }
+        if (!strv_isempty(config_dirs))
+                if (strv_extend_strv_concat(&r, config_dirs, "/systemd/user") < 0)
+                        goto fail;
 
-        t = strv_merge(r, (char**) config_unit_paths);
-        if (!t)
+        if (strv_extend_strv(&r, (char**) config_unit_paths) < 0)
                 goto fail;
-        strv_free(r);
-        r = t;
 
-        if (generator) {
-                t = strv_append(r, generator);
-                if (!t)
+        if (generator)
+                if (strv_extend(&r, generator) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (data_home) {
-                t = strv_append(r, data_home);
-                if (!t)
+        if (data_home)
+                if (strv_extend(&r, data_home) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (!strv_isempty(data_dirs)) {
-                t = strv_merge_concat(r, data_dirs, "/systemd/user");
-                if (!t)
+        if (!strv_isempty(data_dirs))
+                if (strv_extend_strv_concat(&r, data_dirs, "/systemd/user") < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        t = strv_merge(r, (char**) data_unit_paths);
-        if (!t)
+        if (strv_extend_strv(&r, (char**) data_unit_paths) < 0)
                 goto fail;
-        strv_free(r);
-        r = t;
 
-        if (generator_late) {
-                t = strv_append(r, generator_late);
-                if (!t)
+        if (generator_late)
+                if (strv_extend(&r, generator_late) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
         if (!path_strv_make_absolute_cwd(r))
                 goto fail;
 
-finish:
-        free(config_home);
-        strv_free(config_dirs);
-        free(data_home);
-        strv_free(data_dirs);
-
         return r;
 
 fail:
         strv_free(r);
-        r = NULL;
-        goto finish;
+        return NULL;
 }
 
 int lookup_paths_init(
-- 
cgit v1.2.3-54-g00ecf