[WIP patch 6/9] lib: add notmuch_metadata_destroy

diff --git a/3e/6182f9965da26183e4d7bbc5f630ed427cde24 b/3e/6182f9965da26183e4d7bbc5f630ed427cde24
new file mode 100644 (file)
index 0000000..a4be2b0
--- /dev/null
+++ b/3e/6182f9965da26183e4d7bbc5f630ed427cde24
@@ -0,0 +1,118 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id A3F0D6DE1459\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Jan 2016 18:52:24 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.312\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.312 tagged_above=-999 required=5 tests=[AWL=0.239,\r
+  RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id ztSQc4e20zrU for <notmuch@notmuchmail.org>;\r
+ Sat,  9 Jan 2016 18:52:23 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 455036DE02DA\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Jan 2016 18:51:59 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1aI66f-0007E4-8H; Sat, 09 Jan 2016 21:51:49 -0500\r
+Received: (nullmailer pid 29654 invoked by uid 1000);\r
+ Sun, 10 Jan 2016 02:51:47 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [WIP patch 6/9] lib: add notmuch_metadata_destroy\r
+Date: Sat,  9 Jan 2016 22:51:38 -0400\r
+Message-Id: <1452394301-29499-7-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.4\r
+In-Reply-To: <1452394301-29499-1-git-send-email-david@tethera.net>\r
+References: <1452394301-29499-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 10 Jan 2016 02:52:24 -0000\r
+\r
+---\r
+ lib/metadata.cc       |  6 ++++++\r
+ lib/notmuch.h         | 14 +++++++++++++-\r
+ test/T590-metadata.sh |  1 +\r
+ 3 files changed, 20 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/lib/metadata.cc b/lib/metadata.cc\r
+index a355b75..79a0a9e 100644\r
+--- a/lib/metadata.cc\r
++++ b/lib/metadata.cc\r
+@@ -245,3 +245,9 @@ notmuch_metadata_move_to_next (notmuch_metadata_t *metadata)\r
+ {\r
+     (*(metadata->iterator))++;\r
+ }\r
++\r
++void\r
++notmuch_metadata_destroy (notmuch_metadata_t *metadata)\r
++{\r
++    talloc_free (metadata);\r
++}\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index b00126d..6773253 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -1869,12 +1869,18 @@ notmuch_metadata_valid (notmuch_metadata_t *metadata);\r
+ \r
+ /**\r
+  * return key for current metadata pair\r
++ *\r
++ * return value is owned by the iterator, and will be destroyed by the\r
++ * next call to notmuch_metadata_key or notmuch_metadata_destroy.\r
+  */\r
+ const char *\r
+ notmuch_metadata_key (notmuch_metadata_t *metadata);\r
+ \r
+ /**\r
+- * return value for current metadata pair\r
++ * return 'value' for current metadata pair\r
++ *\r
++ * return value is owned by the iterator, and will be destroyed by the\r
++ * next call to notmuch_metadata_value\r
+  */\r
+ const char *\r
+ notmuch_metadata_value (notmuch_metadata_t *metadata);\r
+@@ -1885,6 +1891,12 @@ notmuch_metadata_value (notmuch_metadata_t *metadata);\r
+ void\r
+ notmuch_metadata_move_to_next (notmuch_metadata_t *metadata);\r
+ \r
++/**\r
++ * free any resources held by 'metadata'\r
++ */\r
++void\r
++notmuch_metadata_destroy (notmuch_metadata_t * metadata);\r
++\r
+ /* @} */\r
+ \r
+ NOTMUCH_END_DECLS\r
+diff --git a/test/T590-metadata.sh b/test/T590-metadata.sh\r
+index 4f37c09..4d55298 100755\r
+--- a/test/T590-metadata.sh\r
++++ b/test/T590-metadata.sh\r
+@@ -64,6 +64,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}\r
+       printf("key = %s\n", notmuch_metadata_key (meta));\r
+       printf("val = %s\n", notmuch_metadata_value (meta));\r
+    }\r
++   notmuch_metadata_destroy (meta);\r
+ }\r
+ EOF\r
+ cat <<'EOF' >EXPECTED\r
+-- \r
+2.6.4\r
+\r