X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/201663ffdecb6c21a2f48ad2e9b9eeaf85c029aa..767e669eb7c50e5dd7e1ec9aae5c06c2b66b0819:/sbr/utils.c?ds=sidebyside diff --git a/sbr/utils.c b/sbr/utils.c index 8f6ff76e..06835d2b 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -358,9 +358,21 @@ nmh_strcasestr (const char *s1, const char *s2) { } -/* EndsWithC returns true if non-NULL string s ends with a c before the +/* HasPrefix returns true if non-NULL s starts with non-NULL prefix. */ +bool HasPrefix(const char *s, const char *prefix) +{ + while (*s && *s == *prefix) { + s++; + prefix++; + } + + return *prefix == '\0'; +} + + +/* HasSuffixC returns true if non-NULL string s ends with a c before the * terminating NUL. */ -bool EndsWithC(char *s, int c) +bool HasSuffixC(const char *s, int c) { return *s && s[strlen(s) - 1] == c; } @@ -515,9 +527,8 @@ nmh_version_changed (int older) { char * upcase (const char *str) { char *up = cpytrim (str); - char *cp; - for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); } + ToUpper(up); return up; }