chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
when determining unit file list, include invalid unit names in an "invalid" state
[elogind.git]
/
src
/
shared
/
strv.h
diff --git
a/src/shared/strv.h
b/src/shared/strv.h
index afb31f385fffbb4ef68e956de953da43ec136010..ae4e31f14c4246512ff50e5c9dafe54322beb141 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 -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foostrvhfoo
-#define foostrvhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-47,6
+46,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_;
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;
}
static inline bool strv_isempty(char **l) {
return !l || !*l;
}
@@
-76,5
+79,3
@@
bool strv_overlap(char **a, char **b);
#define STRV_FOREACH_BACKWARDS(s, l) \
for (; (l) && ((s) >= (l)); (s)--)
#define STRV_FOREACH_BACKWARDS(s, l) \
for (; (l) && ((s) >= (l)); (s)--)
-
-#endif