X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fstring-util.h;h=66e55cb2c615ab8cbab8fce97cd730068d395772;hp=54f9d3058cc5257595e30f2c011943c77be67e0d;hb=a683e1878913969ccf8b0defdec4d955e15ed75a;hpb=b96ed50e3493103d075ff2ce4c3fbad8f26b2e22
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 54f9d3058..66e55cb2c 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
@@ -21,7 +19,9 @@
along with systemd; If not, see .
***/
+#include
#include
+#include
#include
#include "macro.h"
@@ -37,6 +37,7 @@
#define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS
#define ALPHANUMERICAL LETTERS DIGITS
+#define HEXDIGITS DIGITS "abcdefABCDEF"
#define streq(a,b) (strcmp((a),(b)) == 0)
#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
@@ -65,6 +66,16 @@ static inline bool isempty(const char *p) {
return !p || !p[0];
}
+#if 0 /// UNNEEDED by elogind
+static inline const char *empty_to_null(const char *p) {
+ return isempty(p) ? NULL : p;
+}
+
+static inline const char *strdash_if_empty(const char *str) {
+ return isempty(str) ? "-" : str;
+}
+#endif // 0
+
static inline char *startswith(const char *s, const char *prefix) {
size_t l;
@@ -75,6 +86,7 @@ static inline char *startswith(const char *s, const char *prefix) {
return NULL;
}
+#if 0 /// UNNEEDED by elogind
static inline char *startswith_no_case(const char *s, const char *prefix) {
size_t l;
@@ -84,6 +96,7 @@ static inline char *startswith_no_case(const char *s, const char *prefix) {
return NULL;
}
+#endif // 0
char *endswith(const char *s, const char *postfix) _pure_;
char *endswith_no_case(const char *s, const char *postfix) _pure_;
@@ -125,12 +138,24 @@ char *strjoin(const char *x, ...) _sentinel_;
})
char *strstrip(char *s);
+#if 0 /// UNNEEDED by elogind
char *delete_chars(char *s, const char *bad);
+#endif // 0
char *truncate_nl(char *s);
-char *ascii_strlower(char *path);
+#if 0 /// UNNEEDED by elogind
+char ascii_tolower(char x);
+char *ascii_strlower(char *s);
+char *ascii_strlower_n(char *s, size_t n);
+
+char ascii_toupper(char x);
+char *ascii_strupper(char *s);
+
+int ascii_strcasecmp_n(const char *a, const char *b, size_t n);
+int ascii_strcasecmp_nn(const char *a, size_t n, const char *b, size_t m);
bool chars_intersect(const char *a, const char *b) _pure_;
+#endif // 0
static inline bool _pure_ in_charset(const char *s, const char* charset) {
assert(s);