From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id D261E6DE0245 for ; Fri, 22 Jun 2018 18:43:06 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[AWL=0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] 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 Nrv1opYluPKN for ; Fri, 22 Jun 2018 18:43:06 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 223646DE022A for ; Fri, 22 Jun 2018 18:43:01 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1fWXZn-0002ll-8o; Fri, 22 Jun 2018 21:42:55 -0400 Received: (nullmailer pid 18038 invoked by uid 1000); Sat, 23 Jun 2018 01:42:49 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 02/12] lib: move string-map functions to libnotmuch_util Date: Fri, 22 Jun 2018 22:42:37 -0300 Message-Id: <20180623014247.17834-3-david@tethera.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180623014247.17834-1-david@tethera.net> References: <20180623014247.17834-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 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: Sat, 23 Jun 2018 01:43:06 -0000 Although they are not yet needed for the CLI, this will facilitate writing unit tests. --- lib/Makefile.local | 1 - lib/notmuch-private.h | 33 +-------------------------------- util/Makefile.local | 3 ++- {lib => util}/string-map.c | 0 util/string-map.h | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 34 deletions(-) rename {lib => util}/string-map.c (100%) create mode 100644 util/string-map.h diff --git a/lib/Makefile.local b/lib/Makefile.local index 5dc057c0..a9a310b4 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -42,7 +42,6 @@ libnotmuch_c_srcs = \ $(dir)/messages.c \ $(dir)/sha1.c \ $(dir)/built-with.c \ - $(dir)/string-map.c \ $(dir)/indexopts.c \ $(dir)/tags.c diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 3764a6a9..063df5cd 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -580,38 +580,7 @@ _notmuch_string_list_append (notmuch_string_list_t *list, void _notmuch_string_list_sort (notmuch_string_list_t *list); -/* string-map.c */ -typedef struct _notmuch_string_map notmuch_string_map_t; -typedef struct _notmuch_string_map_iterator notmuch_string_map_iterator_t; -notmuch_string_map_t * -_notmuch_string_map_create (const void *ctx); - -void -_notmuch_string_map_append (notmuch_string_map_t *map, - const char *key, - const char *value); - -const char * -_notmuch_string_map_get (notmuch_string_map_t *map, const char *key); - -notmuch_string_map_iterator_t * -_notmuch_string_map_iterator_create (notmuch_string_map_t *map, const char *key, - bool exact); - -bool -_notmuch_string_map_iterator_valid (notmuch_string_map_iterator_t *iter); - -void -_notmuch_string_map_iterator_move_to_next (notmuch_string_map_iterator_t *iter); - -const char * -_notmuch_string_map_iterator_key (notmuch_string_map_iterator_t *iterator); - -const char * -_notmuch_string_map_iterator_value (notmuch_string_map_iterator_t *iterator); - -void -_notmuch_string_map_iterator_destroy (notmuch_string_map_iterator_t *iterator); +#include "string-map.h" /* tags.c */ diff --git a/util/Makefile.local b/util/Makefile.local index ba03230e..71a66158 100644 --- a/util/Makefile.local +++ b/util/Makefile.local @@ -5,7 +5,8 @@ extra_cflags += -I$(srcdir)/$(dir) libnotmuch_util_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \ $(dir)/string-util.c $(dir)/talloc-extra.c $(dir)/zlib-extra.c \ - $(dir)/util.c $(dir)/gmime-extra.c $(dir)/crypto.c + $(dir)/util.c $(dir)/gmime-extra.c $(dir)/crypto.c \ + $(dir)/string-map.c libnotmuch_util_modules := $(libnotmuch_util_c_srcs:.c=.o) diff --git a/lib/string-map.c b/util/string-map.c similarity index 100% rename from lib/string-map.c rename to util/string-map.c diff --git a/util/string-map.h b/util/string-map.h new file mode 100644 index 00000000..42d16da4 --- /dev/null +++ b/util/string-map.h @@ -0,0 +1,36 @@ +#ifndef STRING_MAP_H +#define STRING_MAP_H + +#include +typedef struct _notmuch_string_map notmuch_string_map_t; +typedef struct _notmuch_string_map_iterator notmuch_string_map_iterator_t; +notmuch_string_map_t * +_notmuch_string_map_create (const void *ctx); + +void +_notmuch_string_map_append (notmuch_string_map_t *map, + const char *key, + const char *value); + +const char * +_notmuch_string_map_get (notmuch_string_map_t *map, const char *key); + +notmuch_string_map_iterator_t * +_notmuch_string_map_iterator_create (notmuch_string_map_t *map, const char *key, + bool exact); + +bool +_notmuch_string_map_iterator_valid (notmuch_string_map_iterator_t *iter); + +void +_notmuch_string_map_iterator_move_to_next (notmuch_string_map_iterator_t *iter); + +const char * +_notmuch_string_map_iterator_key (notmuch_string_map_iterator_t *iterator); + +const char * +_notmuch_string_map_iterator_value (notmuch_string_map_iterator_t *iterator); + +void +_notmuch_string_map_iterator_destroy (notmuch_string_map_iterator_t *iterator); +#endif -- 2.17.1