X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a4d2247f60879752e29203e7a01c49910ed199c..c4f704eb5309d15ffb7c15fc67074f22d0647951:/sbr/utils.c diff --git a/sbr/utils.c b/sbr/utils.c index b7580252..2e61df89 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; } @@ -490,7 +502,7 @@ nmh_version_changed (int older) { break for versions with multiple decimal points, etc. */ const float current_version = strtof (VERSION, NULL); const float old_version = - context_version && strncmp (context_version, "nmh-", 4) == 0 + context_version && HasPrefix(context_version, "nmh-") ? strtof (context_version + 4, NULL) : 99999999;