Rocco Rutte:

[apps/madmutt.git] / lib / str.c

diff --git a/lib/str.c b/lib/str.c
index 79bb469..8efa126 100644 (file)
--- a/lib/str.c
+++ b/lib/str.c
@@ -23,7 +23,7 @@ char *safe_strdup (const char *s)
 
   if (!s || !*s)
     return 0;
-  l = mutt_strlen (s) + 1;
+  l = safe_strlen (s) + 1;
   p = (char *) safe_malloc (l);
   memcpy (p, s, l);
   return (p);
@@ -67,21 +67,51 @@ char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
   return p;
 }
 
-void mutt_str_replace (char **p, const char *s)
+int safe_strcmp (const char *a, const char *b)
+{
+  return strcmp (NONULL (a), NONULL (b));
+}
+
+int safe_strcasecmp (const char *a, const char *b)
+{
+  return strcasecmp (NONULL (a), NONULL (b));
+}
+
+int safe_strncmp (const char *a, const char *b, size_t l)
+{
+  return strncmp (NONULL (a), NONULL (b), l);
+}
+
+int safe_strncasecmp (const char *a, const char *b, size_t l)
+{
+  return strncasecmp (NONULL (a), NONULL (b), l);
+}
+
+size_t safe_strlen (const char *a)
+{
+  return a ? strlen (a) : 0;
+}
+
+int safe_strcoll (const char *a, const char *b)
+{
+  return strcoll (NONULL (a), NONULL (b));
+}
+
+void str_replace (char **p, const char *s)
 {
   FREE (p);
   *p = safe_strdup (s);
 }
 
-void mutt_str_adjust (char **p)
+void str_adjust (char **p)
 {
   if (!p || !*p)
     return;
-  safe_realloc (p, mutt_strlen (*p) + 1);
+  safe_realloc (p, safe_strlen (*p) + 1);
 }
 
 /* convert all characters in the string to lowercase */
-char *mutt_strlower (char *s)
+char *str_tolower (char *s)
 {
   char *p = s;
 
@@ -95,7 +125,7 @@ char *mutt_strlower (char *s)
 
 /* NULL-pointer aware string comparison functions */
 
-char *mutt_substrcpy (char *dest, const char *beg, const char *end,
+char *str_substrcpy (char *dest, const char *beg, const char *end,
                       size_t destlen)
 {
   size_t len;
@@ -108,7 +138,7 @@ char *mutt_substrcpy (char *dest, const char *beg, const char *end,
   return dest;
 }
 
-char *mutt_substrdup (const char *begin, const char *end)
+char *str_substrdup (const char *begin, const char *end)
 {
   size_t len;
   char *p;
@@ -116,7 +146,7 @@ char *mutt_substrdup (const char *begin, const char *end)
   if (end)
     len = end - begin;
   else
-    len = mutt_strlen (begin);
+    len = safe_strlen (begin);
 
   p = safe_malloc (len + 1);
   memcpy (p, begin, len);
@@ -124,37 +154,7 @@ char *mutt_substrdup (const char *begin, const char *end)
   return p;
 }
 
-int mutt_strcmp (const char *a, const char *b)
-{
-  return strcmp (NONULL (a), NONULL (b));
-}
-
-int mutt_strcasecmp (const char *a, const char *b)
-{
-  return strcasecmp (NONULL (a), NONULL (b));
-}
-
-int mutt_strncmp (const char *a, const char *b, size_t l)
-{
-  return strncmp (NONULL (a), NONULL (b), l);
-}
-
-int mutt_strncasecmp (const char *a, const char *b, size_t l)
-{
-  return strncasecmp (NONULL (a), NONULL (b), l);
-}
-
-size_t mutt_strlen (const char *a)
-{
-  return a ? strlen (a) : 0;
-}
-
-int mutt_strcoll (const char *a, const char *b)
-{
-  return strcoll (NONULL (a), NONULL (b));
-}
-
-const char *mutt_stristr (const char *haystack, const char *needle)
+const char *str_isstr (const char *haystack, const char *needle)
 {
   const char *p, *q;
 
@@ -185,7 +185,6 @@ void mutt_remove_trailing_ws (char *s)
 {
   char *p;
 
-  for (p = s + mutt_strlen (s) - 1; p >= s && ISSPACE (*p); p--)
+  for (p = s + safe_strlen (s) - 1; p >= s && ISSPACE (*p); p--)
     *p = 0;
 }
-