#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)
int i;
for (i = 0; i < 12; i++)
- if (str_ncasecmp (s, Months[i], 3) == 0)
+ if (m_strncasecmp(s, Months[i], 3) == 0)
return (i);
return (-1); /* error */
}
if ((m_strlen(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
return 0;
for (i = 0; i < 7; i++)
- if (str_ncasecmp (s, Weekdays[i], 3) == 0)
+ if (m_strncasecmp(s, Weekdays[i], 3) == 0)
return 1;
return 0;
}
if (path)
*path = 0;
- if (str_ncmp ("From ", s, 5) != 0)
+ if (m_strncmp("From ", s, 5) != 0)
return 0;
s = next_word (s); /* skip over the From part. */
debug_print (3, ("got return path: %s\n", path));
}
- s = p + 1;
- SKIPWS (s);
+ s = vskipspaces(p + 1);
if (!*s)
return 0;