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

diff --git a/from.c b/from.c
index 33d6e84..cc61283 100644
--- a/from.c
+++ b/from.c
@@ -11,11 +11,13 @@
 # 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"
 
 #include <ctype.h>
 #include <string.h>
@@ -33,7 +35,7 @@ int mutt_check_month (const char *s)
   int i;
 
   for (i = 0; i < 12; i++)
-    if (mutt_strncasecmp (s, Months[i], 3) == 0)
+    if (str_ncasecmp (s, Months[i], 3) == 0)
       return (i);
   return (-1);                  /* error */
 }
@@ -42,10 +44,10 @@ static int is_day_name (const char *s)
 {
   int i;
 
-  if ((mutt_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 (mutt_strncasecmp (s, Weekdays[i], 3) == 0)
+    if (str_ncasecmp (s, Weekdays[i], 3) == 0)
       return 1;
   return 0;
 }
@@ -64,14 +66,14 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
   if (path)
     *path = 0;
 
-  if (mutt_strncmp ("From ", s, 5) != 0)
+  if (str_ncmp ("From ", s, 5) != 0)
     return 0;
 
   s = next_word (s);            /* skip over the From part. */
   if (!*s)
     return 0;
 
-  dprint (3, (debugfile, "\nis_from(): parsing: %s", s));
+  debug_print (3, ("parsing: %s\n", s));
 
   if (!is_day_name (s)) {
     const char *p;
@@ -97,7 +99,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
         len = pathlen - 1;
       memcpy (path, s, len);
       path[len] = 0;
-      dprint (3, (debugfile, "is_from(): got return path: %s\n", path));
+      debug_print (3, ("got return path: %s\n", path));
     }
 
     s = p + 1;
@@ -106,7 +108,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
       return 0;
 
     if (!is_day_name (s)) {
-      dprint (1, (debugfile, "is_from():  expected weekday, got: %s\n", s));
+      debug_print (1, ("expected weekday, got: %s\n", s));
       return 0;
     }
   }
@@ -174,9 +176,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
     return 0;
   tm.tm_year = yr > 1900 ? yr - 1900 : (yr < 70 ? yr + 100 : yr);
 
-  dprint (3,
-          (debugfile,
-           "is_from(): month=%d, day=%d, hr=%d, min=%d, sec=%d, yr=%d.\n",
+  debug_print (3, ("month=%d, day=%d, hr=%d, min=%d, sec=%d, yr=%d.\n",
            tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
            tm.tm_year));