X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=6ad7ed045a28b4cd11fb59f6d4f74dfbebf02469;hp=b8ece6dee290dc8840f056e9971d72e0d685f7cb;hb=20deb4ce5f654f7c112a7a4c1cf154d00847cf30;hpb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e

diff --git a/sendlib.c b/sendlib.c
index b8ece6d..6ad7ed0 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -339,8 +339,8 @@ int mutt_write_mime_header (BODY * a, FILE * f)
 int mutt_write_mime_body (BODY * a, FILE * f)
 {
   const char *p;
-  char boundary[SHORT_STRING];
-  char send_charset[SHORT_STRING];
+  char boundary[STRING];
+  char send_charset[STRING];
   FILE *fpin;
   BODY *t;
   fgetconv_t *fc;
@@ -1018,7 +1018,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin)
 /* determine which Content-Transfer-Encoding to use */
 static void mutt_set_encoding (BODY * b, CONTENT * info)
 {
-  char send_charset[SHORT_STRING];
+  char send_charset[STRING];
 
   if (b->type == TYPETEXT) {
     char *chsname =
@@ -1650,8 +1650,8 @@ static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt)
 
 static char *mutt_gen_msgid (void)
 {
-    char buf[SHORT_STRING];
-    char localpart[SHORT_STRING];
+    char buf[STRING];
+    char localpart[STRING];
     const char *fqdn;
 
     if (!(fqdn = mutt_fqdn(0)))
@@ -1840,8 +1840,7 @@ static int mutt_invoke_sendmail (address_t * from,        /* the sender */
   if (option (OPTNEWSSEND)) {
     char cmd[LONG_STRING];
 
-    mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0,
-                       0);
+    m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0);
     if (m_strisempty(cmd)) {
       i = nntp_post (msg);
       unlink (msg);
@@ -2021,7 +2020,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to,
 {
   int i, ret = 0;
   FILE *f;
-  char date[SHORT_STRING], tempfile[_POSIX_PATH_MAX];
+  char date[STRING], tempfile[_POSIX_PATH_MAX];
   MESSAGE *msg = NULL;
 
   if (!h) {