From: Dave Reisner <dreisner@archlinux.org>
Date: Wed, 16 Apr 2014 02:16:40 +0000 (-0400)
Subject: condense assignment and path_kill_slashes calls
X-Git-Tag: v213~354
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=dbb9401dba0bd5157d021e695a47bf52b2d74a2d

condense assignment and path_kill_slashes calls
---

diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index 9d50890ad..139888c4a 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -472,9 +472,7 @@ static int join_path(const char *controller, const char *path, const char *suffi
         if (!t)
                 return -ENOMEM;
 
-        path_kill_slashes(t);
-
-        *fs = t;
+        *fs = path_kill_slashes(t);
         return 0;
 }
 
@@ -957,8 +955,7 @@ int cg_split_spec(const char *spec, char **controller, char **path) {
                         if (!t)
                                 return -ENOMEM;
 
-                        path_kill_slashes(t);
-                        *path = t;
+                        *path = path_kill_slashes(t);
                 }
 
                 if (controller)
@@ -1048,8 +1045,7 @@ int cg_mangle_path(const char *path, char **result) {
                 if (!t)
                         return -ENOMEM;
 
-                path_kill_slashes(t);
-                *result = t;
+                *result = path_kill_slashes(t);
                 return 0;
         }
 
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index e35d7f8d6..373dd7a35 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -464,8 +464,7 @@ int find_binary(const char *name, char **filename) {
                                 continue;
 
                         if (filename) {
-                                path_kill_slashes(p);
-                                *filename = p;
+                                *filename = path_kill_slashes(p);
                                 p = NULL;
                         }