From 8f1e0ad415dab8f3e5d301129fe2bb25c420e66f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 20 Apr 2016 18:20:51 +0200
Subject: path-lookup: optimize a common strv copy operation away

Follow-up for:

https://github.com/systemd/systemd/pull/3033#discussion_r59689398
---
 src/shared/path-lookup.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 80a2ea7940..ca593b6963 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -586,9 +586,16 @@ int lookup_paths_init(
                 if (!add)
                         return -ENOMEM;
 
-                r = strv_extend_strv(&paths, add, true);
-                if (r < 0)
+                if (paths) {
+                        r = strv_extend_strv(&paths, add, true);
+                        if (r < 0)
                                 return r;
+                } else {
+                        /* Small optimization: if paths is NULL (and it usually is), we can simply assign 'add' to it,
+                         * and don't have to copy anything */
+                        paths = add;
+                        add = NULL;
+                }
         }
 
         r = patch_root_prefix(&persistent_config, root);
-- 
cgit v1.2.3-54-g00ecf