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

diff --git a/b9/bee2e374c3dc134df7962cc38cb40be112b28d b/b9/bee2e374c3dc134df7962cc38cb40be112b28d
new file mode 100644 (file)
index 0000000..830aa72
--- /dev/null
+++ b/b9/bee2e374c3dc134df7962cc38cb40be112b28d
@@ -0,0 +1,113 @@
+Return-Path: <jani@nikula.org>\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 914C4431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Jan 2015 09:52:53 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 107YemJ5X4cX for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Jan 2015 09:52:50 -0800 (PST)\r
+Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com\r
+ [74.125.82.53])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 221EC431FAE   for <notmuch@notmuchmail.org>; Fri,  2 Jan 2015 09:52:50 -0800\r
+ (PST)\r
+Received: by mail-wg0-f53.google.com with SMTP id x13so6647061wgg.12\r
+       for <notmuch@notmuchmail.org>; Fri, 02 Jan 2015 09:52:49 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=yblz8LTxZGxCXv6C3KfPPK0L5CHPGBJbVsXKsgSJbCw=;\r
+       b=KfD/tmddy/mnSbGaJvEQ4qu0EHql5XS2KKsqcX7G7OqWw/rS4zevdFoaYIWuMJidBW\r
+       SfVRWnoBpy/Qqtk6R+XKSQMAnZz6O4NR/bKA/z3/x6WsDp9p6vwQdDtmn8a+CMMQuOCe\r
+       TzEH7mWAIj//90xFsNpwk2dmrsQAqal2KUeqeQhtv9FdM2jzccJ/0Ie+MbcQSV6poQls\r
+       BvchnCOggz5CgynriJJk/X8FfjE4qWzoWnraPVBc7Os0rrd7LZHQgKWgW9jn+LB+HDgx\r
+       c8MF/IWFrFQcXxfC6c59TOyFWBrmN+IK5n7zHezWm6WiumpaEEWwHRT6YVlxOxwWG3+5\r
+       o1eA==\r
+X-Gm-Message-State:\r
+ ALoCoQmrdhH9VNIn1rKp4O4nBgyO3HCURTpCKMpQvYou4445YeF6y4m2wzcDd3YU8rYF/hlSCrgu\r
+X-Received: by 10.180.83.42 with SMTP id n10mr106979123wiy.54.1420221169007;\r
+       Fri, 02 Jan 2015 09:52:49 -0800 (PST)\r
+Received: from localhost (mobile-internet-bceeb5-193.dhcp.inet.fi.\r
+       [188.238.181.193])\r
+       by mx.google.com with ESMTPSA id s9sm54861597wiz.12.2015.01.02.09.52.47\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Fri, 02 Jan 2015 09:52:48 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\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~gf2e3d2c (http://notmuchmail.org) Emacs/24.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 02 Jan 2015 19:52:55 +0200\r
+Message-ID: <871tnd1348.fsf@nikula.org>\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 17:52:53 -0000\r
+\r
+On Fri, 02 Jan 2015, David Bremner <david@tethera.net> wrote:\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
+LGTM.\r
+\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