Add (and use) a function mutt_str_replace, which essentially

replaces the sequence:

	safe_free (&s);
	s = safe_strdup (t);

1 files changed, 2 insertions, 4 deletions

diff --git a/sendlib.c b/sendlib.c
index 255f38cc..4ce2d873 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -1381,8 +1381,7 @@ static void encode_headers (LIST *h)
       snprintf (tmp, sizeof (tmp), "%s: ", h->data);
       len = mutt_strlen (tmp);
       rfc2047_encode_string (tmp + len, sizeof (tmp) - len, (unsigned char *) p);
-      safe_free ((void **) &h->data);
-      h->data = safe_strdup (tmp);
+      mutt_str_replace (&h->data, tmp);
     }
   }
 }
@@ -1811,8 +1810,7 @@ void mutt_prepare_envelope (ENVELOPE *env)
   {
     rfc2047_encode_string (buffer, sizeof (buffer) - 1,
 			   (unsigned char *) env->subject);
-    safe_free ((void **) &env->subject);
-    env->subject = safe_strdup (buffer);
+    mutt_str_replace (&env->subject, buffer);
   }
   encode_headers (env->userhdrs);