X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=fb498b7351b0a2836b01126f49037182e4fc3241;hp=adc73d9a5c5b447133f7abf5e27cd0b2093aa542;hb=22601f25ede6703ba7cd06ee84eddd2045308570;hpb=fa4c2af84416f9b4663bb80d36faaba35db05524

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index adc73d9..fb498b7 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -163,27 +163,24 @@ LIST *mutt_parse_references(char *s, int in_reply_to)
     return lst;
 }
 
-int mutt_check_encoding (const char *c)
+int mutt_check_encoding(const char *s)
 {
-  if (ascii_strncasecmp ("7bit", c, sizeof ("7bit") - 1) == 0)
-    return (ENC7BIT);
-  else if (ascii_strncasecmp ("8bit", c, sizeof ("8bit") - 1) == 0)
-    return (ENC8BIT);
-  else if (ascii_strncasecmp ("binary", c, sizeof ("binary") - 1) == 0)
-    return (ENCBINARY);
-  else
-    if (ascii_strncasecmp
-        ("quoted-printable", c, sizeof ("quoted-printable") - 1) == 0)
-    return (ENCQUOTEDPRINTABLE);
-  else if (ascii_strncasecmp ("base64", c, sizeof ("base64") - 1) == 0)
-    return (ENCBASE64);
-  else if (ascii_strncasecmp ("x-uuencode", c, sizeof ("x-uuencode") - 1) == 0)
-    return (ENCUUENCODED);
-  else
-    return (ENCOTHER);
+#define COMPARE(tok, value)                             \
+    if (!ascii_strncasecmp(tok, s, sizeof(tok) - 1)) {  \
+        return value;                                   \
+    }
+    COMPARE("7bit", ENC7BIT);
+    COMPARE("8bit", ENC8BIT);
+    COMPARE("binary", ENCBINARY);
+    COMPARE("quoted-printable", ENCQUOTEDPRINTABLE);
+    COMPARE("base64", ENCBASE64);
+    COMPARE("x-uuencode", ENCUUENCODED);
+#undef COMPARE
+
+    return ENCOTHER;
 }
 
-static PARAMETER *parse_parameters (const char *s)
+static PARAMETER *parse_parameters(const char *s)
 {
   PARAMETER *head = 0, *cur = 0, *new;
   char buffer[LONG_STRING];
@@ -202,7 +199,7 @@ static PARAMETER *parse_parameters (const char *s)
     if (*p != ';') {
       i = p - s;
 
-      new = mutt_new_parameter ();
+      new = parameter_new();
 
       new->attribute = p_dupstr(s, i);
 
@@ -316,7 +313,7 @@ void mutt_parse_content_type (char *s, BODY * ct)
   char *subtype;
 
   p_delete(&ct->subtype);
-  mutt_free_parameter (&ct->parameter);
+  parameter_delete(&ct->parameter);
 
   /* First extract any existing parameters */
   if ((pc = strchr (s, ';')) != NULL) {
@@ -399,7 +396,7 @@ static void parse_content_disposition (char *s, BODY * ct)
       m_strreplace(&ct->filename, s);
     if ((s = mutt_get_parameter ("name", parms)) != 0)
       ct->form_name = m_strdup(s);
-    mutt_free_parameter (&parms);
+    parameter_delete(&parms);
   }
 }
 
@@ -514,7 +511,7 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent)
 {
   BODY *msg;
 
-  parent->hdr = mutt_new_header ();
+  parent->hdr = header_new();
   parent->hdr->offset = ftello (fp);
   parent->hdr->env = mutt_read_rfc822_header (fp, parent->hdr, 0, 0);
   msg = parent->hdr->content;
@@ -1249,12 +1246,12 @@ done:
  * 	        Used for recall-message.
  *
  * Returns:     newly allocated envelope structure.  You should free it by
- *              mutt_free_envelope() when envelope stay unneeded.
+ *              envelope_delete() when envelope stay unneeded.
  */
 ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
                                    short weed)
 {
-  ENVELOPE *e = mutt_new_envelope ();
+  ENVELOPE *e = envelope_new();
   LIST *last = NULL;
   char *line = p_new(char, LONG_STRING);
   char *p;