replace SKIPWS with a proper inline func with the right API.

[apps/madmutt.git] / rfc822.c

diff --git a/rfc822.c b/rfc822.c
index cbe5ba4..30f1379 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -165,7 +165,7 @@ static const char *parse_mailboxdomain (const char *s, const char *nonspecial,
   const char *ps;
 
   while (*s) {
-    SKIPWS (s);
+    s = vskipspaces(s);
     if (strchr (nonspecial, *s) == NULL && is_special (*s))
       return s;
 
@@ -224,7 +224,7 @@ static const char *parse_route_addr (const char *s,
   char token[STRING];
   size_t tokenlen = 0;
 
-  SKIPWS (s);
+  s = vskipspaces(s);
 
   /* find the end of the route */
   if (*s == '@') {
@@ -313,8 +313,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
 
   ws_pending = isspace ((unsigned char) *s);
 
-  SKIPWS (s);
-  begin = s;
+  begin = s = vskipspaces(s);
   while (*s) {
     if (*s == ',') {
       if (phraselen) {
@@ -330,8 +329,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
       commentlen = 0;
       phraselen = 0;
       s++;
-      begin = s;
-      SKIPWS (begin);
+      begin = vskipspaces(s);
     }
     else if (*s == '(') {
       if (commentlen && commentlen < sizeof (comment) - 1)
@@ -359,8 +357,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
       phraselen = 0;
       commentlen = 0;
       s++;
-      begin = s;
-      SKIPWS (begin);
+      begin = vskipspaces(s);
     }
     else if (*s == ';') {
       if (phraselen) {
@@ -383,8 +380,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
       phraselen = 0;
       commentlen = 0;
       s++;
-      begin = s;
-      SKIPWS (begin);
+      begin = vskipspaces(s);
     }
     else if (*s == '<') {
       terminate_buffer (phrase, phraselen);
@@ -425,7 +421,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
       s = ps;
     }
     ws_pending = isspace ((unsigned char) *s);
-    SKIPWS (s);
+    s = vskipspaces(s);
   }
 
   if (phraselen) {