chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: refuse doing %h, %s, %U specifier resolving in PID 1
[elogind.git]
/
src
/
shared
/
strv.h
diff --git
a/src/shared/strv.h
b/src/shared/strv.h
index 737728a3c6bde296b262a9d0a09177b4227a9eed..daf9ad0d0bdaddf89b309728fb5df09956e9adcf 100644
(file)
--- a/
src/shared/strv.h
+++ b/
src/shared/strv.h
@@
-82,16
+82,19
@@
bool strv_overlap(char **a, char **b) _pure_;
#define STRV_FOREACH_PAIR(x, y, l) \
for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
#define STRV_FOREACH_PAIR(x, y, l) \
for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
-
char **strv_sort(char **l);
void strv_print(char **l);
char **strv_sort(char **l);
void strv_print(char **l);
+#define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
+
+#define STRV_MAKE_EMPTY ((char*[1]) { NULL })
+
#define strv_from_stdarg_alloca(first) \
({ \
char **_l; \
\
if (!first) \
#define strv_from_stdarg_alloca(first) \
({ \
char **_l; \
\
if (!first) \
- _l = (
(char*[1]) { NULL });
\
+ _l = (
char**) &first;
\
else { \
unsigned _n; \
va_list _ap; \
else { \
unsigned _n; \
va_list _ap; \