Added -r to gcov invocation.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 8f6ff76e8a817097b6460201c456b544936fbdc6..d6a96d846e2321b510d742df5211287e58d2f46a 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -358,9 +358,33 @@ 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';
+}
+
+
+/* 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. */
  * terminating NUL. */

-bool EndsWithC(char *s, int c)
+bool HasSuffixC(const char *s, int c)

 {
     return *s && s[strlen(s) - 1] == c;
 }
 {
     return *s && s[strlen(s) - 1] == c;
 }


@@ -490,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 =
            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;
 
             ?  strtof (context_version + 4, NULL)
             :  99999999;
 


@@ -515,9 +539,8 @@ nmh_version_changed (int older) {
 char *
 upcase (const char *str) {
     char *up = cpytrim (str);
 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;
 }
 
     return up;
 }