[PATCH] lib: collapse computation of directory_id into a single expression

diff --git a/87/563ec161d49f0ec879d5a228793ea1aa045349 b/87/563ec161d49f0ec879d5a228793ea1aa045349
new file mode 100644 (file)
index 0000000..adb7f67
--- /dev/null
+++ b/87/563ec161d49f0ec879d5a228793ea1aa045349
@@ -0,0 +1,86 @@
+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 C861B431FDB\r
+       for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 01:08:23 -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 6fSGTsoKQtv8 for <notmuch@notmuchmail.org>;\r
+       Sat, 27 Dec 2014 01:08:20 -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 A1D6A431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 01:08:20 -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 1Y4nMB-0004S7-MJ; Sat, 27 Dec 2014 05:08:19 -0400\r
+Received: (nullmailer pid 24499 invoked by uid 1000); Sat, 27 Dec 2014\r
+       08:33:59 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: collapse computation of directory_id into a single\r
+       expression\r
+Date: Sat, 27 Dec 2014 09:33:49 +0100\r
+Message-Id: <1419669229-24454-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.3\r
+In-Reply-To: <20141226113755.GA64154@pamparam>\r
+References: <20141226113755.GA64154@pamparam>\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: Sat, 27 Dec 2014 09:08:23 -0000\r
+\r
+According to id:20141226113755.GA64154@pamparam , the lifetime\r
+of (*i).c_str is only guaranteed for that line, so we extract the\r
+information we need in the same line.\r
+---\r
+ lib/message.cc | 9 ++++-----\r
+ 1 file changed, 4 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index a7a13cc..14e60af 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -639,7 +639,7 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)\r
+ \r
+     for (i.skip_to (direntry_prefix); i != message->doc.termlist_end (); i++) {\r
+       unsigned int directory_id;\r
+-      const char *direntry, *directory;\r
++      const char *directory;\r
+       char *colon;\r
+ \r
+       /* Terminate loop at first term without desired prefix. */\r
+@@ -649,10 +649,9 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)\r
+       /* Indicate that there are filenames remaining. */\r
+       status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
+ \r
+-      direntry = (*i).c_str ();\r
+-      direntry += direntry_prefix_len;\r
+-\r
+-      directory_id = strtol (direntry, &colon, 10);\r
++      directory_id =\r
++          strtol ((*i).c_str () + direntry_prefix_len,\r
++                  &colon, 10);\r
+ \r
+       if (colon == NULL || *colon != ':')\r
+           INTERNAL_ERROR ("malformed direntry");\r
+-- \r
+2.1.3\r
+\r