X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib%2Fstr.c;h=3d3f10e7d02003c981eb9b44f928415c770ee7a7;hp=f90e8617746f6af9cdd7f2d4e3984a0606d7f883;hb=3c3c535e5ed1d651c6024b5acf670e217af473f7;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/lib/str.c b/lib/str.c
index f90e861..3d3f10e 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -17,77 +17,6 @@
 
 #include "str.h"
 
-char *str_cat (char *d, size_t l, const char *s)
-{
-  char *p = d;
-
-  if (!l)
-    return d;
-
-  l--;                          /* Space for the trailing '\0'. */
-
-  for (; *d && l; l--)
-    d++;
-  for (; *s && l; l--)
-    *d++ = *s++;
-
-  *d = '\0';
-
-  return p;
-}
-
-char *str_ncat (char *d, size_t l, const char *s, size_t sl)
-{
-  char *p = d;
-
-  if (!l)
-    return d;
-
-  l--;                          /* Space for the trailing '\0'. */
-
-  for (; *d && l; l--)
-    d++;
-  for (; *s && l && sl; l--, sl--)
-    *d++ = *s++;
-
-  *d = '\0';
-
-  return p;
-}
-
-int str_casecmp (const char *a, const char *b)
-{
-  return strcasecmp (NONULL (a), NONULL (b));
-}
-
-int str_ncmp (const char *a, const char *b, size_t l)
-{
-  return strncmp (NONULL (a), NONULL (b), l);
-}
-
-int str_ncasecmp (const char *a, const char *b, size_t l)
-{
-  return strncasecmp (NONULL (a), NONULL (b), l);
-}
-
-int str_coll (const char *a, const char *b)
-{
-  return strcoll (NONULL (a), NONULL (b));
-}
-
-void str_replace (char **p, const char *s)
-{
-  p_delete(p);
-  *p = m_strdup(s);
-}
-
-void str_adjust (char **p)
-{
-  if (!p || !*p)
-    return;
-  p_realloc(p, m_strlen(*p) + 1);
-}
-
 /* convert all characters in the string to lowercase */
 char *str_tolower (char *s)
 {
@@ -147,12 +76,7 @@ int str_eq (const char* s1, const char* s2) {
 
   if (l != m_strlen(s2))
     return (0);
-  return (str_ncmp (s1, s2, l) == 0);
-}
-
-char* str_skip_initws (char* s) {
-  SKIPWS (s);
-  return (s);
+  return (m_strncmp(s1, s2, l) == 0);
 }
 
 void str_skip_trailws (char *s) {