[PATCH] lib: convert two "iterator copy strings" into references.

diff --git a/fd/4533d4059060c8906e6d6bd79e7da630c67b50 b/fd/4533d4059060c8906e6d6bd79e7da630c67b50
new file mode 100644 (file)
index 0000000..291976f
--- /dev/null
+++ b/fd/4533d4059060c8906e6d6bd79e7da630c67b50
@@ -0,0 +1,84 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4BC61431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Jan 2015 08:21:08 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id DiY9hNMJjNdg for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Jan 2015 08:21:05 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 210C8431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Jan 2015 08:21:05 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Y74yD-0007Rv-62; Fri, 02 Jan 2015 12:21:01 -0400\r
+Received: (nullmailer pid 4224 invoked by uid 1000); Fri, 02 Jan 2015\r
+       16:20:55 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: convert two "iterator copy strings" into references.\r
+Date: Fri,  2 Jan 2015 17:20:52 +0100\r
+Message-Id: <1420215652-4131-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.3\r
+In-Reply-To: <1419763508-11902-1-git-send-email-david@tethera.net>\r
+References: <1419763508-11902-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 02 Jan 2015 16:21:08 -0000\r
+\r
+Apparently this is a supported and even idiomatic way of keeping a\r
+temporary object (e.g. like that returned from an operator\r
+dereference) alive.\r
+---\r
+\r
+I decided it was better to do both of these "keepalive" strings the\r
+same way, so I applied the parent patch as is.\r
+\r
+ lib/message.cc | 4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index bacb4d4..956a70a 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -283,7 +283,7 @@ _notmuch_message_get_term (notmuch_message_t *message,\r
+     if (i == end)\r
+       return NULL;\r
+ \r
+-    std::string term = *i;\r
++    const std::string &term = *i;\r
+     if (strncmp (term.c_str(), prefix, prefix_len))\r
+       return NULL;\r
+ \r
+@@ -641,7 +641,7 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)\r
+       unsigned int directory_id;\r
+       const char *direntry, *directory;\r
+       char *colon;\r
+-      const std::string term = *i;\r
++      const std::string &term = *i;\r
+ \r
+       /* Terminate loop at first term without desired prefix. */\r
+       if (strncmp (term.c_str (), direntry_prefix, direntry_prefix_len))\r
+-- \r
+2.1.3\r
+\r