X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/14665143f973d5dbcdab34de439bdd37a56d0e5f..5093cef6808539a5e3b279cabc41d55f1bb5ac71:/sbr/utils.c diff --git a/sbr/utils.c b/sbr/utils.c index a6f0e111..d6a96d84 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -370,9 +370,21 @@ bool HasPrefix(const char *s, const char *prefix) } +/* HasSuffix returns true if non-NULL s ends with non-NULL suffix. */ +bool HasSuffix(const char *s, const char *suffix) +{ + size_t ls, lsuf; + + ls = strlen(s); + lsuf = strlen(suffix); + + return lsuf <= ls && !strcmp(s + ls - lsuf, suffix); +} + + /* HasSuffixC returns true if non-NULL string s ends with a c before the * terminating NUL. */ -bool HasSuffixC(char *s, int c) +bool HasSuffixC(const char *s, int c) { return *s && s[strlen(s) - 1] == c; } @@ -502,7 +514,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;