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

diff --git a/6a/1cc48ade3fea5cabd28e9368cdf8a9f3e13dd3 b/6a/1cc48ade3fea5cabd28e9368cdf8a9f3e13dd3
new file mode 100644 (file)
index 0000000..c7799e9
--- /dev/null
+++ b/6a/1cc48ade3fea5cabd28e9368cdf8a9f3e13dd3
@@ -0,0 +1,101 @@
+Return-Path: <tomi.ollila@iki.fi>\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 2FE71431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Jan 2015 12:08:09 -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 bpuvSRvRJSAi for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Jan 2015 12:08:06 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id D1512431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Jan 2015 12:08:05 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id BA780100051;\r
+       Fri,  2 Jan 2015 22:07:38 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] lib: convert two "iterator copy strings" into references.\r
+In-Reply-To: <1420215652-4131-1-git-send-email-david@tethera.net>\r
+References: <1419763508-11902-1-git-send-email-david@tethera.net>\r
+       <1420215652-4131-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.19+6~g8725b09 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 02 Jan 2015 22:07:38 +0200\r
+Message-ID: <m2vbkp0wvp.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 20:08:09 -0000\r
+\r
+On Fri, Jan 02 2015, David Bremner <david@tethera.net> wrote:\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
+Based on internet search with words 'c++ reference to temporary' (*)\r
+I believe the change is working one.\r
+\r
+Tomi\r
+\r
+(*) Uh, reading those explations gives me a headache >;)\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r