Kill mutt_rfc2047_encode_32 macro

diff --git a/mutt/rfc2047.h b/mutt/rfc2047.h
index 7e031b5b2e43a1b1dd89f3367d878f567840f6d1..bb2113ca275be9dd6a4ec3683464fd50554544f1 100644 (file)
--- a/mutt/rfc2047.h
+++ b/mutt/rfc2047.h
@@ -25,8 +25,6 @@
 #ifndef _MUTT_LIB_RFC2047_H
 #define _MUTT_LIB_RFC2047_H
 
-#define mutt_rfc2047_encode_32(a, b) mutt_rfc2047_encode(a, NULL, 32, b);
-
 void mutt_rfc2047_encode(char **pd, const char *specials, int col, const char *charsets);
 void mutt_rfc2047_decode(char **pd);
 

diff --git a/send.c b/send.c
index abcf4bfa5cb25c63e88ff721d17b531b8dad6ed8..c36079b93b13623831354b626cda07511f080357 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1135,7 +1135,7 @@ void mutt_encode_descriptions(struct Body *b, short recurse)
   {
     if (t->description)
     {
-      mutt_rfc2047_encode_32(&t->description, SendCharset);
+      mutt_rfc2047_encode(&t->description, NULL, sizeof("Content-Description:"), SendCharset);
     }
     if (recurse && t->parts)
       mutt_encode_descriptions(t->parts, recurse);

diff --git a/sendlib.c b/sendlib.c
index def5f7c57c2d1506139964767f1b0ff8cb93f235..a5f30c5b6ee4a1453a479d0e01cb7c245e99022f 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2209,10 +2209,10 @@ static void encode_headers(struct ListHead *h)
     if (!tmp)
       continue;
 
-    mutt_rfc2047_encode_32(&tmp, SendCharset);
-    mutt_mem_realloc(&np->data, mutt_str_strlen(np->data) + 2 + mutt_str_strlen(tmp) + 1);
+    mutt_rfc2047_encode(&tmp, NULL, i + 2, SendCharset);
+    mutt_mem_realloc(&np->data, i + 2 + mutt_str_strlen(tmp) + 1);
 
-    sprintf(np->data + i, ": %s", NONULL(tmp));
+    sprintf(np->data + i + 2, "%s", tmp);
 
     FREE(&tmp);
   }
@@ -2687,7 +2687,7 @@ void mutt_prepare_envelope(struct Envelope *env, int final)
     if (!OPT_NEWS_SEND || MimeSubject)
 #endif
     {
-      mutt_rfc2047_encode_32(&env->subject, SendCharset);
+      mutt_rfc2047_encode(&env->subject, NULL, sizeof("Subject:"), SendCharset);
     }
   encode_headers(&env->userhdrs);
 }