chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v234: Apply missing upstream fixes in src/basic (1/6)
[elogind.git]
/
src
/
basic
/
strv.h
diff --git
a/src/basic/strv.h
b/src/basic/strv.h
index dafb4fdc1ba2fee161496bc9153d5232faa55360..a01f685f9b512c10e0b4aa12e54384113ffe4ccf 100644
(file)
--- a/
src/basic/strv.h
+++ b/
src/basic/strv.h
@@
-68,9
+68,9
@@
char **strv_remove(char **l, const char *s);
char **strv_uniq(char **l);
#if 0 /// UNNEEDED by elogind
bool strv_is_uniq(char **l);
char **strv_uniq(char **l);
#if 0 /// UNNEEDED by elogind
bool strv_is_uniq(char **l);
+#endif // 0
bool strv_equal(char **a, char **b);
bool strv_equal(char **a, char **b);
-#endif // 0
#define strv_contains(l, s) (!!strv_find((l), (s)))
#define strv_contains(l, s) (!!strv_find((l), (s)))
@@
-122,9
+122,7
@@
bool strv_overlap(char **a, char **b) _pure_;
for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
char **strv_sort(char **l);
for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
char **strv_sort(char **l);
-#if 0 /// UNNEEDED by elogind
void strv_print(char **l);
void strv_print(char **l);
-#endif // 0
#define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
#define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
@@
-193,8
+191,10
@@
static inline bool strv_fnmatch_or_empty(char* const* patterns, const char *s, i
char ***strv_free_free(char ***l);
char **strv_skip(char **l, size_t n);
char ***strv_free_free(char ***l);
char **strv_skip(char **l, size_t n);
+#endif // 0
int strv_extend_n(char ***l, const char *value, size_t n);
int strv_extend_n(char ***l, const char *value, size_t n);
+#if 0 /// UNNEEDED by elogind
int fputstrv(FILE *f, char **l, const char *separator, bool *space);
#endif // 0
int fputstrv(FILE *f, char **l, const char *separator, bool *space);
#endif // 0