From 21212e522478551f3d256619a2efe2b885ad0948 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 8 Feb 2015 11:22:39 -0500 Subject: util: rework strappenda(), and rename it strjoina() After all it is now much more like strjoin() than strappend(). At the same time, add support for NULL sentinels, even if they are normally not necessary. Signed-off-by: Anthony G. Basile --- src/shared/conf-files.c | 2 +- src/shared/util.h | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/shared') diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index c68f361136..b4c2f7154c 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -42,7 +42,7 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char assert(path); assert(suffix); - dirpath = strappenda(root ? root : "", path); + dirpath = strjoina(root ? root : "", path); dir = opendir(dirpath); if (!dir) { diff --git a/src/shared/util.h b/src/shared/util.h index b9f095791d..c5dd6bde0a 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -414,19 +414,19 @@ static inline unsigned log2u_round_up(unsigned x) { int unlink_noerrno(const char *path); -#define strappenda(a, ...) \ - ({ \ - int _len = strlen(a); \ - unsigned _i; \ - char *_d_, *_p_; \ - const char *_appendees_[] = { __VA_ARGS__ }; \ - for (_i = 0; _i < ELEMENTSOF(_appendees_); _i++) \ - _len += strlen(_appendees_[_i]); \ - _d_ = alloca(_len + 1); \ - _p_ = stpcpy(_d_, a); \ - for (_i = 0; _i < ELEMENTSOF(_appendees_); _i++) \ - _p_ = stpcpy(_p_, _appendees_[_i]); \ - _d_; \ +#define strjoina(a, ...) \ + ({ \ + const char *_appendees_[] = { a, __VA_ARGS__ }; \ + char *_d_, *_p_; \ + int _len_ = 0; \ + unsigned _i_; \ + for (_i_ = 0; _i_ < ELEMENTSOF(_appendees_) && _appendees_[_i_]; _i_++) \ + _len_ += strlen(_appendees_[_i_]); \ + _p_ = _d_ = alloca(_len_ + 1); \ + for (_i_ = 0; _i_ < ELEMENTSOF(_appendees_) && _appendees_[_i_]; _i_++) \ + _p_ = stpcpy(_p_, _appendees_[_i_]); \ + *_p_ = 0; \ + _d_; \ }) #define procfs_file_alloca(pid, field) \ -- cgit v1.2.3-54-g00ecf