util: change return value of startswith() to non-consteudev/v1.10

This way we can use it on non-const strings, and don't end up with a
const'ified result.

This is similar to libc's strstr() which also takes a const string but
returns a non-const one.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/shared/util.h b/src/shared/util.h
index dd1c515f90..d5c6705497 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -117,9 +117,13 @@ static inline bool isempty(const char *p) {
         return !p || !p[0];
 }
 
-static inline const char *startswith(const char *s, const char *prefix) {
-        if (strncmp(s, prefix, strlen(prefix)) == 0)
-                return s + strlen(prefix);
+static inline char *startswith(const char *s, const char *prefix) {
+        size_t l;
+
+        l = strlen(prefix);
+        if (strncmp(s, prefix, l) == 0)
+                return (char*) s + l;
+
         return NULL;
 }