X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=45558d8960e703f60afa50dcb1df34f16ab5d9c9;hb=0c0271841ab45595f71528c50bcf1904d4b841d5;hp=afb31f385fffbb4ef68e956de953da43ec136010;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index afb31f385..45558d896 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,6 +30,7 @@ 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); @@ -47,6 +47,10 @@ char **strv_uniq(char **l); char **strv_new(const char *x, ...) _sentinel_ _malloc_; char **strv_new_ap(const char *x, va_list ap) _malloc_; +static inline const char* STRV_IFNOTNULL(const char *x) { + return x ? x : (const char *) -1; +} + static inline bool strv_isempty(char **l) { return !l || !*l; } @@ -77,4 +81,4 @@ bool strv_overlap(char **a, char **b); #define STRV_FOREACH_BACKWARDS(s, l) \ for (; (l) && ((s) >= (l)); (s)--) -#endif +char **strv_sort(char **l);