diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-04-15 22:16:40 -0400 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2014-04-21 09:52:08 -0400 |
| commit | dbb9401dba0bd5157d021e695a47bf52b2d74a2d (patch) | |
| tree | 1e1702058f666fdff25227e3366560918e6291ea | |
| parent | 6d6c604ac8ac777dde0eeb58745ee6e76e2ea43d (diff) | |
condense assignment and path_kill_slashes calls
| -rw-r--r-- | src/shared/cgroup-util.c | 10 | ||||
| -rw-r--r-- | src/shared/path-util.c | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 9d50890adc..139888c4a1 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 e35d7f8d67..373dd7a35c 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; } |