X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=33c752a313c0b36990c5e4da7825c49ec74aedff;hb=0783951b931cb2743a43cbfdc37babd76fedd2fe;hp=635e92b728ed551142fbf0ba45a2cec502b3bd26;hpb=07719a21b6425d378b36bb8d7f47ad5ec5296d28;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index 635e92b72..33c752a31 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foostrvhfoo -#define foostrvhfoo +#pragma once /*** This file is part of systemd. @@ -31,12 +30,14 @@ char *strv_find(char **l, const char *name); char *strv_find_prefix(char **l, const char *name); void strv_free(char **l); +void strv_freep(char ***l); char **strv_copy(char **l) _malloc_; unsigned strv_length(char **l); char **strv_merge(char **a, char **b); char **strv_merge_concat(char **a, char **b, const char *suffix); char **strv_append(char **l, const char *s); +int strv_extend(char ***l, const char *value); char **strv_remove(char **l, const char *s); char **strv_remove_prefix(char **l, const char *s); @@ -81,4 +82,9 @@ bool strv_overlap(char **a, char **b); #define STRV_FOREACH_BACKWARDS(s, l) \ for (; (l) && ((s) >= (l)); (s)--) -#endif +#define STRV_FOREACH_PAIR(x, y, l) \ + for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2) + + +char **strv_sort(char **l); +void strv_print(char **l);