diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-07-13 13:41:01 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-07-13 13:41:01 +0200 |
| commit | b7def684941808600c344f0be7a2b9fcdda97e0f (patch) | |
| tree | d28516d55a035ae9f754cb21e6d97eb3d0e21e27 /src/shared/cgroup-util.c | |
| parent | man: fix man page chapter in Makefile.am (diff) | |
| download | systemd-b7def684941808600c344f0be7a2b9fcdda97e0f.tar.xz systemd-b7def684941808600c344f0be7a2b9fcdda97e0f.zip | |
util: rename join() to strjoin()
This is to match strappend() and the other string related functions.
Diffstat (limited to 'src/shared/cgroup-util.c')
| -rw-r--r-- | src/shared/cgroup-util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 6740d3b885..b0d378de5a 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -522,16 +522,16 @@ static int join_path(const char *controller, const char *path, const char *suffi if (controller) { if (path && suffix) - t = join("/sys/fs/cgroup/", controller, "/", path, "/", suffix, NULL); + t = strjoin("/sys/fs/cgroup/", controller, "/", path, "/", suffix, NULL); else if (path) - t = join("/sys/fs/cgroup/", controller, "/", path, NULL); + t = strjoin("/sys/fs/cgroup/", controller, "/", path, NULL); else if (suffix) - t = join("/sys/fs/cgroup/", controller, "/", suffix, NULL); + t = strjoin("/sys/fs/cgroup/", controller, "/", suffix, NULL); else - t = join("/sys/fs/cgroup/", controller, NULL); + t = strjoin("/sys/fs/cgroup/", controller, NULL); } else { if (path && suffix) - t = join(path, "/", suffix, NULL); + t = strjoin(path, "/", suffix, NULL); else if (path) t = strdup(path); } |