Added -r to gcov invocation.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 06835d2bfcb57e9487ed478a15a2bcf181af17c0..d6a96d846e2321b510d742df5211287e58d2f46a 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -370,6 +370,18 @@ 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(const char *s, int 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;