chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service,mount,socket: explicitly unwatch control pids
[elogind.git]
/
strv.h
diff --git
a/strv.h
b/strv.h
index acaae9e7ea8b69c6ee026331370f7130890df37b..7ee9a95a8f5c68d35ebc46b0f9f389e9fe1d420c 100644
(file)
--- a/
strv.h
+++ b/
strv.h
@@
-39,6
+39,7
@@
char **strv_uniq(char **l);
#define strv_contains(l, s) (!!strv_find((l), (s)))
char **strv_new(const char *x, ...) _sentinel;
#define strv_contains(l, s) (!!strv_find((l), (s)))
char **strv_new(const char *x, ...) _sentinel;
+char **strv_new_ap(const char *x, va_list ap);
static inline bool strv_isempty(char **l) {
return !l || !*l;
static inline bool strv_isempty(char **l) {
return !l || !*l;
@@
-49,6
+50,8
@@
char **strv_split_quoted(const char *s);
char *strv_join(char **l, const char *separator);
char *strv_join(char **l, const char *separator);
+char **strv_env_merge(char **x, ...) _sentinel;
+
#define STRV_FOREACH(s, l) \
for ((s) = (l); (s) && *(s); (s)++)
#define STRV_FOREACH(s, l) \
for ((s) = (l); (s) && *(s); (s)++)