projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3594f80
)
string-util: use size_t for strjoina macro (#6914)
author
Jonathan Lebon
<jlebon@users.noreply.github.com>
Mon, 25 Sep 2017 19:56:57 +0000
(15:56 -0400)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 25 Sep 2017 19:56:57 +0000
(21:56 +0200)
`strlen` returns a `size_t` and `alloca` expects a `size_t`.
src/basic/string-util.h
patch
|
blob
|
history
diff --git
a/src/basic/string-util.h
b/src/basic/string-util.h
index
34eb952
..
c511aee
100644
(file)
--- a/
src/basic/string-util.h
+++ b/
src/basic/string-util.h
@@
-120,7
+120,7
@@
char *strjoin_real(const char *x, ...) _sentinel_;
({ \
const char *_appendees_[] = { a, __VA_ARGS__ }; \
char *_d_, *_p_; \
-
in
t _len_ = 0; \
+
size_
t _len_ = 0; \
unsigned _i_; \
for (_i_ = 0; _i_ < ELEMENTSOF(_appendees_) && _appendees_[_i_]; _i_++) \
_len_ += strlen(_appendees_[_i_]); \