X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=eafdfe69a08a2de385d6ab5a8abbe074d33bd92b;hp=87c44a05bbbc02029f6a13df697e4f1b6ca7c0ad;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/from.c b/from.c
index 87c44a0..eafdfe6 100644
--- a/from.c
+++ b/from.c
@@ -11,23 +11,22 @@
 # 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 <lib-lib/debug.h>
 
 #include "mutt.h"
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <string.h>
-
-static const char *next_word (const char *s)
+static const char *next_word(const char *s)
 {
-  while (*s && !ISSPACE (*s))
-    s++;
-  SKIPWS (s);
-  return s;
+    while (*s && !ISSPACE(*s))
+        s++;
+    s = skipspaces(s);
+    return s;
 }
 
 int mutt_check_month (const char *s)
@@ -102,8 +101,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
       debug_print (3, ("got return path: %s\n", path));
     }
 
-    s = p + 1;
-    SKIPWS (s);
+    s = vskipspaces(p + 1);
     if (!*s)
       return 0;