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

[apps/madmutt.git] / pattern.c

diff --git a/pattern.c b/pattern.c
index a02e96e..f40ea59 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -359,8 +359,7 @@ int eat_range (pattern_t * pat, BUFFER * s, BUFFER * err)
   if (skip_quote && *tmp == '"')
     tmp++;
 
   if (skip_quote && *tmp == '"')
     tmp++;
 

-  SKIPWS (tmp);
-  s->dptr = tmp;
+  s->dptr = vskipspaces(tmp);

   return 0;
 }
 
   return 0;
 }
 


@@ -468,7 +467,7 @@ static const char *parse_date_range (const char *pc, struct tm *min,
     const char *pt;
     char ch = *pc++;
 
     const char *pt;
     char ch = *pc++;
 

-    SKIPWS (pc);
+    pc = vskipspaces(pc);

     switch (ch) {
     case '-':
       {
     switch (ch) {
     case '-':
       {


@@ -524,7 +523,7 @@ static const char *parse_date_range (const char *pc, struct tm *min,
     default:
       flag |= M_PDR_ERRORDONE;
     }
     default:
       flag |= M_PDR_ERRORDONE;
     }

-    SKIPWS (pc);
+    pc = vskipspaces(pc);

   }
   if ((flag & M_PDR_ERROR) && !(flag & M_PDR_ABSOLUTE)) {       /* getDate has its own error message, don't overwrite it here */
     snprintf (err->data, err->dsize, _("Invalid relative date: %s"), pc - 1);
   }
   if ((flag & M_PDR_ERROR) && !(flag & M_PDR_ABSOLUTE)) {       /* getDate has its own error message, don't overwrite it here */
     snprintf (err->data, err->dsize, _("Invalid relative date: %s"), pc - 1);


@@ -608,11 +607,11 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
         return (-1);
       }
       haveMin = TRUE;
         return (-1);
       }
       haveMin = TRUE;

-      SKIPWS (pc);
+      pc = vskipspaces(pc);

       if (*pc == '-') {
       if (*pc == '-') {

-        const char *pt = pc + 1;
+        const char *pt;

 
 

-        SKIPWS (pt);
+        pt = skipspaces(pc + 1);

         untilNow = (*pt == '\0');
       }
     }
         untilNow = (*pt == '\0');
       }
     }


@@ -718,7 +717,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
   ps.dsize = m_strlen(s);
 
   while (*ps.dptr) {
   ps.dsize = m_strlen(s);
 
   while (*ps.dptr) {

-    SKIPWS (ps.dptr);
+    ps.dptr = vskipspaces(ps.dptr);

     switch (*ps.dptr) {
     case '^':
       ps.dptr++;
     switch (*ps.dptr) {
     case '^':
       ps.dptr++;


@@ -792,8 +791,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
       }
       tmp->op = entry->op;
 
       }
       tmp->op = entry->op;
 

-      ps.dptr++;                /* eat the operator and any optional whitespace */
-      SKIPWS (ps.dptr);
+      ps.dptr = vskipspaces(ps.dptr + 1);

 
       if (entry->eat_arg) {
         if (!*ps.dptr) {
 
       if (entry->eat_arg) {
         if (!*ps.dptr) {