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/util.c | |
| parent | 184850e8a741beb795f6ea66091f3fb176fce880 (diff) | |
util: rename join() to strjoin()
This is to match strappend() and the other string related functions.
Diffstat (limited to 'src/shared/util.c')
| -rw-r--r-- | src/shared/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 63471899fd..2aabd8d634 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1083,7 +1083,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * if (h < 0) return h; - r = join("[", t, "]", NULL); + r = strjoin("[", t, "]", NULL); free(t); if (!r) @@ -5145,7 +5145,7 @@ finish: return r; } -char *join(const char *x, ...) { +char *strjoin(const char *x, ...) { va_list ap; size_t l; char *r, *p; |