chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: fix STRV_FOREACH_PAIR macro definition
[elogind.git]
/
src
/
shared
/
strv.h
diff --git
a/src/shared/strv.h
b/src/shared/strv.h
index 623f10216dd8339f2d948f11d040022c5afd081c..49058f8df8ff4fa9cd197b47280cd99039ea0182 100644
(file)
--- a/
src/shared/strv.h
+++ b/
src/shared/strv.h
@@
-30,7
+30,10
@@
char *strv_find(char **l, const char *name);
char *strv_find_prefix(char **l, const char *name);
void strv_free(char **l);
char *strv_find_prefix(char **l, const char *name);
void strv_free(char **l);
-void strv_freep(char ***l);
+static inline void strv_freep(char ***l) {
+ strv_free(*l);
+}
+
char **strv_copy(char **l) _malloc_;
unsigned strv_length(char **l);
char **strv_copy(char **l) _malloc_;
unsigned strv_length(char **l);
@@
-74,7
+77,7
@@
bool strv_overlap(char **a, char **b);
for (; (l) && ((s) >= (l)); (s)--)
#define STRV_FOREACH_PAIR(x, y, l) \
for (; (l) && ((s) >= (l)); (s)--)
#define STRV_FOREACH_PAIR(x, y, l) \
- for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2)
+ for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2
, (y) = (x + 1)
)
char **strv_sort(char **l);
char **strv_sort(char **l);