From 5aa57e1a6c063f16eaf2c81cbfa4393d9047a44b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 10 Jan 2016 22:51:37 +2000 Subject: [PATCH] [WIP patch 5/9] lib: add notmuch_metadata_move_to_next --- b8/26b11494bd79f77d735c70b1f6926977de8b13 | 119 ++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 b8/26b11494bd79f77d735c70b1f6926977de8b13 diff --git a/b8/26b11494bd79f77d735c70b1f6926977de8b13 b/b8/26b11494bd79f77d735c70b1f6926977de8b13 new file mode 100644 index 000000000..b01636d32 --- /dev/null +++ b/b8/26b11494bd79f77d735c70b1f6926977de8b13 @@ -0,0 +1,119 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 5893F6DE1552 + for ; Sat, 9 Jan 2016 18:52:29 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.312 +X-Spam-Level: +X-Spam-Status: No, score=-0.312 tagged_above=-999 required=5 tests=[AWL=0.239, + RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id MSgeUzXrL83N for ; + Sat, 9 Jan 2016 18:52:26 -0800 (PST) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id CE2286DE1532 + for ; Sat, 9 Jan 2016 18:51:59 -0800 (PST) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1aI66g-0007EF-AC; Sat, 09 Jan 2016 21:51:50 -0500 +Received: (nullmailer pid 29652 invoked by uid 1000); + Sun, 10 Jan 2016 02:51:47 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [WIP patch 5/9] lib: add notmuch_metadata_move_to_next +Date: Sat, 9 Jan 2016 22:51:37 -0400 +Message-Id: <1452394301-29499-6-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.6.4 +In-Reply-To: <1452394301-29499-1-git-send-email-david@tethera.net> +References: <1452394301-29499-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 10 Jan 2016 02:52:29 -0000 + +--- + lib/metadata.cc | 6 ++++++ + lib/notmuch.h | 6 ++++++ + test/T590-metadata.sh | 12 +++++++----- + 3 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/lib/metadata.cc b/lib/metadata.cc +index 6236992..a355b75 100644 +--- a/lib/metadata.cc ++++ b/lib/metadata.cc +@@ -239,3 +239,9 @@ notmuch_metadata_value (notmuch_metadata_t *metadata) + + return val; + } ++ ++void ++notmuch_metadata_move_to_next (notmuch_metadata_t *metadata) ++{ ++ (*(metadata->iterator))++; ++} +diff --git a/lib/notmuch.h b/lib/notmuch.h +index dd359c8..b00126d 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -1879,6 +1879,12 @@ notmuch_metadata_key (notmuch_metadata_t *metadata); + const char * + notmuch_metadata_value (notmuch_metadata_t *metadata); + ++/** ++ * move 'metadata' iterator to the next pair ++ */ ++void ++notmuch_metadata_move_to_next (notmuch_metadata_t *metadata); ++ + /* @} */ + + NOTMUCH_END_DECLS +diff --git a/test/T590-metadata.sh b/test/T590-metadata.sh +index d2326d4..4f37c09 100755 +--- a/test/T590-metadata.sh ++++ b/test/T590-metadata.sh +@@ -55,21 +55,23 @@ testkey2 = testvalue2 + EOF + test_expect_equal_file EXPECTED OUTPUT + +-test_begin_subtest "notmuch_database_get_all_metadata first item" ++test_begin_subtest "get all metadata in one class" + cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} + { + notmuch_metadata_t *meta; + RUN(notmuch_database_get_all_metadata (db, NOTMUCH_METADATA_CONFIG, &meta)); +- printf("valid = %d\n", notmuch_metadata_valid (meta)); +- printf("key = %s\n", notmuch_metadata_key (meta)); +- printf("val = %s\n", notmuch_metadata_value (meta)); ++ for (; notmuch_metadata_valid (meta); notmuch_metadata_move_to_next (meta)) { ++ printf("key = %s\n", notmuch_metadata_key (meta)); ++ printf("val = %s\n", notmuch_metadata_value (meta)); ++ } + } + EOF + cat <<'EOF' >EXPECTED + == stdout == +-valid = 1 + key = testkey1 + val = testvalue1 ++key = testkey2 ++val = testvalue2 + == stderr == + EOF + test_expect_equal_file EXPECTED OUTPUT +-- +2.6.4 + -- 2.26.2