X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=cc6128371bae73af8182d546af2a8b89d3462595;hp=e3d2ad36c8b737b40c77f09b0a1ea0bca24c1fb1;hb=617e7d83d14e14e6a520a48e75437211b16c8834;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/from.c b/from.c
index e3d2ad3..cc61283 100644
--- a/from.c
+++ b/from.c
@@ -11,9 +11,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 
-#include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
@@ -34,7 +35,7 @@ int mutt_check_month (const char *s)
   int i;
 
   for (i = 0; i < 12; i++)
-    if (safe_strncasecmp (s, Months[i], 3) == 0)
+    if (str_ncasecmp (s, Months[i], 3) == 0)
       return (i);
   return (-1);                  /* error */
 }
@@ -43,10 +44,10 @@ static int is_day_name (const char *s)
 {
   int i;
 
-  if ((safe_strlen (s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
+  if ((str_len (s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
     return 0;
   for (i = 0; i < 7; i++)
-    if (safe_strncasecmp (s, Weekdays[i], 3) == 0)
+    if (str_ncasecmp (s, Weekdays[i], 3) == 0)
       return 1;
   return 0;
 }
@@ -65,7 +66,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
   if (path)
     *path = 0;
 
-  if (safe_strncmp ("From ", s, 5) != 0)
+  if (str_ncmp ("From ", s, 5) != 0)
     return 0;
 
   s = next_word (s);            /* skip over the From part. */