X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=9ff0debb6c2e677cefa871a3761fa52e34f56c24;hp=70379fa759e04c7dde9ededa9799f9d1c7ff35dc;hb=ee869a42bc5677da8e3602ec1947af1736786648;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/parse.c b/parse.c
index 70379fa..9ff0deb 100644
--- a/parse.c
+++ b/parse.c
@@ -15,9 +15,9 @@
 #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 "recvattach.h"
 #include "mx.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 */
       }