fix regression, propably due to some changes in the string API

[apps/madmutt.git] / parse.c

diff --git a/parse.c b/parse.c
index fe0a40d..9ff0deb 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -13,12 +13,12 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
 
 #include "mutt.h"
-#include "buffer.h"
 #include "enter.h"
-#include "ascii.h"
 #include "recvattach.h"
 #include "mx.h"
 #include "mime.h"
@@ -45,7 +45,7 @@ char *mutt_read_rfc822_line (FILE * f, char *line, size_t * linelen)
   char ch;
   size_t offset = 0;
 
-  FOREVER {
+  for (;;) {
     if (fgets (buf, *linelen - offset, f) == NULL ||    /* end of file or */
         (ISSPACE (*line) && !offset)) { /* end of headers */
       *line = 0;
@@ -612,7 +612,7 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
         buffer[i] = 0;
 
       /* Check for the end boundary */
-      if (str_cmp (buffer + blen + 2, "--") == 0) {
+      if (m_strcmp(buffer + blen + 2, "--") == 0) {
         final = 1;
         break;                  /* done parsing */
       }
@@ -805,7 +805,7 @@ time_t mutt_parse_date (const char *s, HEADER * h)
     t = scratch;
   SKIPWS (t);
 
-  memset (&tm, 0, sizeof (tm));
+  p_clear(&tm, 1);
 
   while ((t = strtok (t, " \t")) != NULL) {
     switch (count) {