chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
util: rename join() to strjoin()
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 63471899fd111f8d21da5c74baecfcd464fb130d..2aabd8d6346df41de2419754c4b56f56abd71979 100644
(file)
--- 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 =
str
join("[", t, "]", NULL);
free(t);
if (!r)
@@
-5145,7
+5145,7
@@
finish:
return r;
}
-char *join(const char *x, ...) {
+char *
str
join(const char *x, ...) {
va_list ap;
size_t l;
char *r, *p;