basic: add new merge_env_file function

[elogind.git] / src / basic / string-util.h

diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index d029d538bd5ea46ab5cbb26cbc8ef9508623db82..66e55cb2c615ab8cbab8fce97cd730068d395772 100644 (file)
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -66,6 +66,7 @@ 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;
 }
@@ -73,6 +74,7 @@ static inline const char *empty_to_null(const char *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;
@@ -84,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;
 
@@ -93,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_;
@@ -134,9 +138,12 @@ 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);
 
+#if 0 /// UNNEEDED by elogind
 char ascii_tolower(char x);
 char *ascii_strlower(char *s);
 char *ascii_strlower_n(char *s, size_t n);
@@ -148,6 +155,7 @@ 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);