From: Jani Nikula <jani@nikula.org>
Date: Tue, 13 Sep 2016 17:14:14 +0000 (+0300)
Subject: cli/reply: make references header creation easier to follow
X-Git-Tag: 0.23_rc0~32
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1e289ed1c9fb8af8696c2735b714438bd115725f;hp=b1aca0e502e97ab822da60aa4217d4b0bdb33543

cli/reply: make references header creation easier to follow

Just use strdup when original references is not available, instead of
trying to cram everything into a monster asprintf. There should be no
functional changes.
---

diff --git a/notmuch-reply.c b/notmuch-reply.c
index eb074055..c2d7402d 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -538,13 +538,12 @@ create_reply_message(void *ctx,
     g_mime_object_set_header (GMIME_OBJECT (reply), "In-Reply-To", in_reply_to);
 
     orig_references = notmuch_message_get_header (message, "references");
-    if (!orig_references)
-	/* Treat errors like missing References headers. */
-	orig_references = "";
-    references = talloc_asprintf (ctx, "%s%s%s",
-				  *orig_references ? orig_references : "",
-				  *orig_references ? " " : "",
-				  in_reply_to);
+    if (orig_references && *orig_references)
+	references = talloc_asprintf (ctx, "%s %s", orig_references,
+				      in_reply_to);
+    else
+	references = talloc_strdup (ctx, in_reply_to);
+
     g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);
 
     from_addr = add_recipients_from_message (reply, config,