use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index ea02d98..d39deae 100644 (file)
--- a/send.c
+++ b/send.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
@@ -29,7 +30,6 @@
 #include "url.h"
 #include "attach.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <ctype.h>
@@ -219,7 +219,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
       return (-1);
     p_delete(&en->newsgroups);
-    en->newsgroups = str_dup (buf);
+    en->newsgroups = m_strdup(buf);
 
     if (en->followup_to)
       strfcpy (buf, en->followup_to, sizeof (buf));
@@ -229,7 +229,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
         && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
       return (-1);
     p_delete(&en->followup_to);
-    en->followup_to = str_dup (buf);
+    en->followup_to = m_strdup(buf);
 
     if (en->x_comment_to)
       strfcpy (buf, en->x_comment_to, sizeof (buf));
@@ -239,7 +239,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
         && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
       return (-1);
     p_delete(&en->x_comment_to);
-    en->x_comment_to = str_dup (buf);
+    en->x_comment_to = m_strdup(buf);
   }
   else
 #endif
@@ -305,7 +305,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 char *nntp_get_header (const char *s)
 {
   SKIPWS (s);
-  return str_dup (s);
+  return m_strdup(s);
 }
 #endif
 
@@ -368,7 +368,7 @@ static void process_user_header (ENVELOPE * env)
       }
       else
         last = env->userhdrs = mutt_new_list ();
-      last->data = str_dup (uh->data);
+      last->data = m_strdup(uh->data);
     }
   }
 }
@@ -603,7 +603,7 @@ LIST *mutt_make_references (ENVELOPE * e)
 
   if (e->message_id) {
     t = mutt_new_list ();
-    t->data = str_dup (e->message_id);
+    t->data = m_strdup(e->message_id);
     t->next = l;
     l = t;
   }
@@ -651,15 +651,15 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
    */
   if (curenv->real_subj) {
     p_delete(&env->subject);
-    env->subject = p_new(char, str_len(curenv->real_subj) + 5);
+    env->subject = p_new(char, m_strlen(curenv->real_subj) + 5);
     sprintf (env->subject, "Re: %s", curenv->real_subj);        /* __SPRINTF_CHECKED__ */
   }
   else if (!env->subject)
-    env->subject = str_dup ("Re: your mail");
+    env->subject = m_strdup("Re: your mail");
 
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
-    env->x_comment_to = str_dup (mutt_get_name (curenv->from));
+    env->x_comment_to = m_strdup(mutt_get_name (curenv->from));
 #endif
 }
 
@@ -687,7 +687,7 @@ void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
 
   if (curenv->message_id) {
     *q = mutt_new_list ();
-    (*q)->data = str_dup (curenv->message_id);
+    (*q)->data = m_strdup(curenv->message_id);
   }
 
   if (pp)
@@ -751,7 +751,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
       /* in case followup set Newsgroups: with Followup-To: if it present */
       if (!env->newsgroups && curenv &&
           str_casecmp (curenv->followup_to, "poster"))
-        env->newsgroups = str_dup (curenv->followup_to);
+        env->newsgroups = m_strdup(curenv->followup_to);
     }
     else
 #endif
@@ -894,7 +894,7 @@ void mutt_set_followup_to (ENVELOPE * e)
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND)) {
     if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
-      e->followup_to = str_dup (e->newsgroups);
+      e->followup_to = m_strdup(e->newsgroups);
     return;
   }
 #endif
@@ -967,7 +967,7 @@ static ADDRESS *set_reverse_name (ENVELOPE * env)
     if (!option (OPTREVREAL))
       p_delete(&tmp->personal);
     if (!tmp->personal)
-      tmp->personal = str_dup (Realname);
+      tmp->personal = m_strdup(Realname);
   }
   return (tmp);
 }
@@ -986,12 +986,12 @@ ADDRESS *mutt_default_from (void)
     adr = rfc822_cpy_adr_real (From);
   else if (option (OPTUSEDOMAIN)) {
     adr = rfc822_new_address ();
-    adr->mailbox = p_new(char, str_len(Username) + str_len(fqdn) + 2);
+    adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
     sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));  /* __SPRINTF_CHECKED__ */
   }
   else {
     adr = rfc822_new_address ();
-    adr->mailbox = str_dup (NONULL (Username));
+    adr->mailbox = m_strdup(NONULL (Username));
   }
 
   return (adr);
@@ -1139,7 +1139,7 @@ int ci_send_message (int flags, /* send mode */
 
 
   if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
-    signas = str_dup (PgpSignAs);
+    signas = m_strdup(PgpSignAs);
 
   /* Delay expansion of aliases until absolutely necessary--shouldn't
    * be necessary unless we are prompting the user or about to execute a
@@ -1194,8 +1194,8 @@ int ci_send_message (int flags, /* send mode */
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
 
-    if (!(ctype = str_dup (ContentType)))
-      ctype = str_dup ("text/plain");
+    if (!(ctype = m_strdup(ContentType)))
+      ctype = m_strdup("text/plain");
     mutt_parse_content_type (ctype, msg->content);
     p_delete(&ctype);
 
@@ -1212,11 +1212,11 @@ int ci_send_message (int flags, /* send mode */
     if (!tempfile) {
       mutt_mktemp (buffer);
       tempfp = safe_fopen (buffer, "w+");
-      msg->content->filename = str_dup (buffer);
+      msg->content->filename = m_strdup(buffer);
     }
     else {
       tempfp = safe_fopen (tempfile, "a+");
-      msg->content->filename = str_dup (tempfile);
+      msg->content->filename = m_strdup(tempfile);
     }
 
     if (!tempfp) {
@@ -1270,7 +1270,7 @@ int ci_send_message (int flags, /* send mode */
 #ifdef USE_NNTP
     if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
         && !msg->env->newsgroups)
-      msg->env->newsgroups = str_dup (((NNTP_DATA *) ctx->data)->group);
+      msg->env->newsgroups = m_strdup(((NNTP_DATA *) ctx->data)->group);
 #endif
 
     if (!(flags & SENDMAILX) &&
@@ -1415,7 +1415,7 @@ int ci_send_message (int flags, /* send mode */
      that $realname can be set in a send-hook */
   if (msg->env->from && !msg->env->from->personal
       && !(flags & (SENDRESEND | SENDPOSTPONED)))
-    msg->env->from->personal = str_dup (Realname);
+    msg->env->from->personal = m_strdup(Realname);
 
   if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
     safe_fclose (&tempfp);