shared: add is_efiboot()

[elogind.git] / src / shared / strv.h

diff --git a/src/shared/strv.h b/src/shared/strv.h
index afb31f385fffbb4ef68e956de953da43ec136010..45558d8960e703f60afa50dcb1df34f16ab5d9c9 100644 (file)
--- 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);