From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UyofEiAdA2CWMAAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 17:06:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SP1rDSAdA2AiKgAAB5/wlQ (envelope-from ) for ; Sat, 16 Jan 2021 17:06:40 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 012D39404DF for ; Sat, 16 Jan 2021 17:06:40 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 85E7A2BFAF; Sat, 16 Jan 2021 12:05:13 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4B2D12BF61 for ; Sat, 16 Jan 2021 12:04:39 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 38BB25FF47; Sat, 16 Jan 2021 12:04:39 -0500 (EST) Received: (nullmailer pid 842377 invoked by uid 1000); Sat, 16 Jan 2021 17:04:15 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 01/38] lib: add _notmuch_string_map_set Date: Sat, 16 Jan 2021 13:03:29 -0400 Message-Id: <20210116170406.842014-2-david@tethera.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210116170406.842014-1-david@tethera.net> References: <20210116170406.842014-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 4FTSAEB4OV3FUVIXV6XM6MPFFVCXHTC6 X-Message-ID-Hash: 4FTSAEB4OV3FUVIXV6XM6MPFFVCXHTC6 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.08 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 012D39404DF X-Spam-Score: -1.08 X-Migadu-Scanner: scn1.migadu.com X-TUID: Qs2LAQGvOMWn This will be used (and tested) by the configuration caching code to be added in the next commit. --- lib/notmuch-private.h | 5 +++++ lib/string-map.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 57ec7f72..51016b0b 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -638,6 +638,11 @@ _notmuch_string_map_append (notmuch_string_map_t *map, const char *key, const char *value); +void +_notmuch_string_map_set (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); diff --git a/lib/string-map.c b/lib/string-map.c index a88404c7..1f3215fb 100644 --- a/lib/string-map.c +++ b/lib/string-map.c @@ -142,6 +142,21 @@ bsearch_first (notmuch_string_pair_t *array, size_t len, const char *key, bool e return NULL; } +void +_notmuch_string_map_set (notmuch_string_map_t *map, const char *key, const char *val) +{ + notmuch_string_pair_t *pair; + + /* this means that calling string_map_set invalidates iterators */ + _notmuch_string_map_sort (map); + pair = bsearch_first (map->pairs, map->length, key, true); + if (! pair) + _notmuch_string_map_append (map, key, val); + else { + talloc_free (pair->value); + pair->value = talloc_strdup (map->pairs, val); + } +} const char * _notmuch_string_map_get (notmuch_string_map_t *map, const char *key) -- 2.29.2