Clean up, and change .SS case to Title Case, from UPPER,

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index ca809439ea7262c4d58cfec365c67cdeb494be6a..d27fa81de1c8722c4c0ef5ea3d4acd4a7c2154a7 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -346,9 +346,9 @@ nmh_strcasestr (const char *s1, const char *s2) {
 }
 
 
 }
 
 

-/* truncpy copies at most size - 1 chars from non-NULL src to non-NULL
- * dst, and ensures dst is NUL terminated.  If size is zero then it
- * aborts as dst cannot be NUL terminated.
+/* truncpy copies at most size - 1 chars from non-NULL src to non-NULL,
+ * non-overlapping, dst, and ensures dst is NUL terminated.  If size is
+ * zero then it aborts as dst cannot be NUL terminated.

  *
  * It's to be used when truncation is intended and correct, e.g.
  * reporting a possibly very long external string back to the user.  One
  *
  * It's to be used when truncation is intended and correct, e.g.
  * reporting a possibly very long external string back to the user.  One


@@ -371,8 +371,8 @@ void trunccpy(char *dst, const char *src, size_t size)
 }
 
 
 }
 
 

-/* HasPrefix returns true if non-NULL s starts with non-NULL prefix. */
-bool HasPrefix(const char *s, const char *prefix)
+/* has_prefix returns true if non-NULL s starts with non-NULL prefix. */
+bool has_prefix(const char *s, const char *prefix)

 {
     while (*s && *s == *prefix) {
         s++;
 {
     while (*s && *s == *prefix) {
         s++;


@@ -383,8 +383,8 @@ 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)
+/* has_suffix returns true if non-NULL s ends with non-NULL suffix. */
+bool has_suffix(const char *s, const char *suffix)

 {
     size_t ls, lsuf;
 
 {
     size_t ls, lsuf;
 


@@ -395,17 +395,17 @@ bool HasSuffix(const char *s, const char *suffix)
 }
 
 
 }
 
 

-/* HasSuffixC returns true if non-NULL string s ends with a c before the
+/* has_suffix_c returns true if non-NULL string s ends with a c before the

  * terminating NUL. */
  * terminating NUL. */

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

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

-/* TrimSuffixC deletes c from the end of non-NULL string s if it's
+/* trim_suffix_c deletes c from the end of non-NULL string s if it's

  * present, shortening s by 1.  Only one instance of c is removed. */
  * present, shortening s by 1.  Only one instance of c is removed. */

-void TrimSuffixC(char *s, int c)
+void trim_suffix_c(char *s, int c)

 {
     if (!*s)
         return;
 {
     if (!*s)
         return;


@@ -416,8 +416,8 @@ void TrimSuffixC(char *s, int c)
 }
 
 
 }
 
 

-/* ToLower runs all of s through tolower(3). */
-void ToLower(char *s)
+/* to_lower runs all of s through tolower(3). */
+void to_lower(char *s)

 {
     unsigned char *b;
 
 {
     unsigned char *b;
 


@@ -426,8 +426,8 @@ void ToLower(char *s)
 }
 
 
 }
 
 

-/* ToUpper runs all of s through toupper(3). */
-void ToUpper(char *s)
+/* to_upper runs all of s through toupper(3). */
+void to_upper(char *s)

 {
     unsigned char *b;
 
 {
     unsigned char *b;
 


@@ -527,7 +527,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  &&  HasPrefix(context_version, "nmh-")
+            context_version  &&  has_prefix(context_version, "nmh-")

             ?  strtof (context_version + 4, NULL)
             :  99999999;
 
             ?  strtof (context_version + 4, NULL)
             :  99999999;
 


@@ -553,7 +553,7 @@ char *
 upcase (const char *str) {
     char *up = cpytrim (str);
 
 upcase (const char *str) {
     char *up = cpytrim (str);
 

-    ToUpper(up);
+    to_upper(up);

 
     return up;
 }
 
     return up;
 }