summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-21 21:28:40 -0400
committerAnthony G. Basile <blueness@gentoo.org>2014-08-22 08:04:30 -0400
commitc1402fc74466c41f0c8663ceee1b96d7c2ccce84 (patch)
tree7aac6154261d7f2bfce2f77b4d51ac1a1cb10b41 /src
parente8011305b20e41a499f54a4d42f4e393f7ebc908 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/shared/util.h10
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;
}