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
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 01c63353151549ca8dceb8ad0014aa478ae13ead..eef6536b01f0897d9d182bc50d0f0f01b00e6b2c 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-192,7
+192,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
if (!dirent_is_file(de))
continue;
if (!dirent_is_file(de))
continue;
- p = join(path, "/", de->d_name, NULL);
+ p =
str
join(path, "/", de->d_name, NULL);
if (!p) {
r = -ENOMEM;
goto finish;
if (!p) {
r = -ENOMEM;
goto finish;
@@
-254,7
+254,7
@@
static int process_suffix(const char *prefixes, const char *suffix) {
NULSTR_FOREACH(p, prefixes) {
char *t;
NULSTR_FOREACH(p, prefixes) {
char *t;
- t = join(p, "/", suffix, NULL);
+ t =
str
join(p, "/", suffix, NULL);
if (!t) {
r = -ENOMEM;
goto finish;
if (!t) {
r = -ENOMEM;
goto finish;