X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=712205238cd96632327da1100bf0fd99b4511826;hp=64686fc9eb642343f90dc55cc7aabb6db52b46c1;hb=a2a7836df164f0e198ad34dbc2f82baf7847fb94;hpb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13

diff --git a/from.c b/from.c
index 64686fc..7122052 100644
--- a/from.c
+++ b/from.c
@@ -11,17 +11,15 @@
 # include "config.h"
 #endif
 
+#include <ctype.h>
+#include <string.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <string.h>
-
 static const char *next_word(const char *s)
 {
     while (*s && !ISSPACE(*s))
@@ -58,7 +56,7 @@ static int is_day_name (const char *s)
  * From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
  */
 
-int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
+int is_from (const char *s, char *path, ssize_t pathlen, time_t * tp)
 {
   struct tm tm;
   int yr;
@@ -73,11 +71,9 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
   if (!*s)
     return 0;
 
-  debug_print (3, ("parsing: %s\n", s));
-
   if (!is_day_name (s)) {
     const char *p;
-    size_t len;
+    ssize_t len;
     short q = 0;
 
     for (p = s; *p && (q || !ISSPACE (*p)); p++) {
@@ -94,12 +90,11 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
       return 0;
 
     if (path) {
-      len = (size_t) (p - s);
+      len = p - s;
       if (len + 1 > pathlen)
         len = pathlen - 1;
       memcpy (path, s, len);
       path[len] = 0;
-      debug_print (3, ("got return path: %s\n", path));
     }
 
     s = vskipspaces(p + 1);
@@ -107,7 +102,6 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
       return 0;
 
     if (!is_day_name (s)) {
-      debug_print (1, ("expected weekday, got: %s\n", s));
       return 0;
     }
   }
@@ -175,10 +169,6 @@ 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);
 
-  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));
-
   tm.tm_isdst = -1;
 
   if (tp)