From patchwork Sat Apr 25 02:59:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Kumar X-Patchwork-Id: 11509629 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8366114DD for ; Sat, 25 Apr 2020 03:00:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BBC52087E for ; Sat, 25 Apr 2020 03:00:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KoTxeIIn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726108AbgDYDAt (ORCPT ); Fri, 24 Apr 2020 23:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726061AbgDYDAt (ORCPT ); Fri, 24 Apr 2020 23:00:49 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AE1FC09B049 for ; Fri, 24 Apr 2020 20:00:49 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id x26so5555668pgc.10 for ; Fri, 24 Apr 2020 20:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3xvR/WkJJMhFTkttGE5FSKsYRrQqt1XhV9esX837F9E=; b=KoTxeIInzo9+0pDeqgNJuOsDz2ZdDUdQjZT6sXoX3cNy3DpRq+drbduU3q1ciyQSG7 CkbCQ/tL2Sgh9k/qWQk67UeNWce7rpUXP/J6FCEnw+C4beTZHfjxh2OG+Nyvxqc7gr3k GF1FHs2EvgQjUzvljjmi8/HtCW8CTWWfKkGcU2wjLH0548ztTtVBRHf56fFQMIqeEQ3m U41+q5d+B04n0VEbzwSaOYKZJZYVB2PVinxYZLF4CC8mYsuCu6MNxwvf8JzqV2yn4Vin jF+NimRBo6pcRz2pz2DAulu0TU4J/lzbrR7OshwakqSGz17BsHgFTUs1EB4TAfcceNlc 4K8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3xvR/WkJJMhFTkttGE5FSKsYRrQqt1XhV9esX837F9E=; b=uBDrP5PORnfL5cSsedV3ZsaQYMQifbCpOnHZtGVqtaCC7z6W/HLccL+dCtzihsld9m cO13rDMRzLhepuxa+4pcXvcPejh85mlitRq8q+wnVaZDBI+9Z6bk28WCsb7+N5H0WcJS nSvM6AfFxfplCPM2npwKA2cZ9dR3M7CygjjRbu7pNcuBU66QUxJGoDzIxy7ks1I85SQ3 aEpW3DzSVUqqx5v3pOPSJl6E9Eoouwx1zTgkzo5bplifdB0KLP8j+gOpUqowYNcRBUqs UQ8J1VKGZ4aPu3BZ/aRpFugTTx6ozY13FRQ87q64GOVZHN49qqlp5hpdeX4RjLccw/x8 2RuQ== X-Gm-Message-State: AGi0PuYxlySwdwVMTYkl7PQAgGElDR6oocQt4Bw76wLK8gyIbl781wDq 3my05b890jbxG8gVFt9qeoMIm2TlueU= X-Google-Smtp-Source: APiQypKviHvG5DBEAPjZ/t6j8hYDlP53wr+YXCOydicdYJIbfGp/+tGnj+NLF6U718Mo154YhAP6uA== X-Received: by 2002:a63:6c83:: with SMTP id h125mr12930428pgc.168.1587783648151; Fri, 24 Apr 2020 20:00:48 -0700 (PDT) Received: from localhost.localdomain ([2409:4064:79a:d9e8:1f9e:c3b5:9fc6:c4b2]) by smtp.gmail.com with ESMTPSA id f99sm5990992pjg.22.2020.04.24.20.00.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 20:00:47 -0700 (PDT) From: Abhishek Kumar To: git@vger.kernel.org Subject: [PATCH v3 2/3] oidmap: rework iterators to return typed pointer Date: Sat, 25 Apr 2020 08:29:20 +0530 Message-Id: <20200425025921.1397-2-abhishekkumar8222@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200425025921.1397-1-abhishekkumar8222@gmail.com> References: <20200408040659.14511-1-abhishekkumar8222@gmail.com> <20200425025921.1397-1-abhishekkumar8222@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 87571c3f (hashmap: use *_entry APIs for iteration, 2019-10-06) modified hashmap_iter_next() to return a hashmap_entry pointer instead of void pointer. However, oidmap_iter_next() is unaware of the struct type containing oidmap_entry and explicitly returns a void pointer. Rewrite oidmap_iter_next() to return oidmap_entry pointer and add helper macros to return pointers to container struct. Signed-off-by: Abhishek Kumar --- oidmap.h | 41 +++++++++++++++++++++++++++++++++++------ t/helper/test-oidmap.c | 7 ++++--- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/oidmap.h b/oidmap.h index c66a83ab1d..d79b087ab0 100644 --- a/oidmap.h +++ b/oidmap.h @@ -66,6 +66,8 @@ void *oidmap_put(struct oidmap *map, void *entry); */ void *oidmap_remove(struct oidmap *map, const struct object_id *key); +#define oidmap_entry_from_hashmap_entry(entry) \ + container_of_or_null(entry, struct oidmap_entry, internal_entry) struct oidmap_iter { struct hashmap_iter h_iter; @@ -76,18 +78,45 @@ static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter hashmap_iter_init(&map->map, &iter->h_iter); } -static inline void *oidmap_iter_next(struct oidmap_iter *iter) +/* Returns the next oidmap_entry, or NULL if there are no more entries. */ +static inline struct oidmap_entry *oidmap_iter_next(struct oidmap_iter *iter) { - /* TODO: this API could be reworked to do compile-time type checks */ - return (void *)hashmap_iter_next(&iter->h_iter); + return oidmap_entry_from_hashmap_entry( + hashmap_iter_next(&iter->h_iter)); } -static inline void *oidmap_iter_first(struct oidmap *map, +/* Initializes the iterator and returns the first entry, if any. */ +static inline struct oidmap_entry *oidmap_iter_first(struct oidmap *map, struct oidmap_iter *iter) { oidmap_iter_init(map, iter); - /* TODO: this API could be reworked to do compile-time type checks */ - return (void *)oidmap_iter_next(iter); + return oidmap_iter_next(iter); } +/* + * Returns the first entry in @map using @iter, where the entry if of + * @type (e.g. "struct foo") and @member is the name of the + * "struct oidmap_entry" in @type + */ +#define oidmap_iter_first_entry(map, iter, type, member) \ + container_of_or_null(oidmap_iter_first(map, iter), type, member) + +/* Internal macro for oidmap_for_each_entry */ +#define oidmap_iter_next_entry_offset(iter, offset) \ + container_of_or_null_offset(oidmap_iter_next(iter), offset) + +/* Internal macro for oidmap_for_each_entry */ +#define oidmap_iter_first_entry_offset(map, iter, offset) \ + container_of_or_null_offset(oidmap_iter_first(map, iter), offset) + +/* + * Iterate through @map using @iter, @var is a pointer to a type + * containing a @member which is a "struct oidmap_entry" + */ +#define oidmap_for_each_entry(map, iter, var, member) \ + for (var = oidmap_iter_first_entry_offset(map, iter, \ + OFFSETOF_VAR(var, member)); \ + var; \ + var = oidmap_iter_next_entry_offset(iter, \ + OFFSETOF_VAR(var, member))) #endif diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c index 0acf99931e..3f599b21b8 100644 --- a/t/helper/test-oidmap.c +++ b/t/helper/test-oidmap.c @@ -95,9 +95,10 @@ int cmd__oidmap(int argc, const char **argv) } else if (!strcmp("iterate", cmd)) { struct oidmap_iter iter; - oidmap_iter_init(&map, &iter); - while ((entry = oidmap_iter_next(&iter))) - printf("%s %s\n", oid_to_hex(&entry->entry.oid), entry->name); + struct test_entry *ent; + + oidmap_for_each_entry(&map, &iter, ent, entry) + printf("%s %s\n", oid_to_hex(&ent->entry.oid), ent->name); } else { From patchwork Sat Apr 25 02:59:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Kumar X-Patchwork-Id: 11509631 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7B9792A for ; Sat, 25 Apr 2020 03:01:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 968C420776 for ; Sat, 25 Apr 2020 03:01:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m5rjM2tC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726135AbgDYDAy (ORCPT ); Fri, 24 Apr 2020 23:00:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726061AbgDYDAx (ORCPT ); Fri, 24 Apr 2020 23:00:53 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A137FC09B049 for ; Fri, 24 Apr 2020 20:00:53 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id g2so4474496plo.3 for ; Fri, 24 Apr 2020 20:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rih5fgqoIJsqa0XMaouHupFPMdNFXNvfJwa2td2FniE=; b=m5rjM2tCWYX7m5WgRvVzi8pwfEazQMRAqL142e7zdU22ZIiHNySFUBQsuAyCNSpbPv RAdAGNkXP0DBWtUE2asDyAMBaKk8ucZQARYx5GNbVO1N0ti2vUWrW4evCtaDZKF8QGnW GPQfcmsn1IbgMQQ/rZmyO6s5j20R4cHcQSe8O1FQy15/x5kLb4Ed7HjHpR57hfo+rGtW 2UFNyY86kkv9d/bEMQ2Z+Imd+v/VdSdc+dB28IVOCj4YsGim73bP0oaLPjfhtkA0XhNt Ls+BMSNQW20RVEFKumZPCNp5NSdzsTASF315VkxK4kgWiJjmuEkcs3roeWM4OsMjCbtc ghPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rih5fgqoIJsqa0XMaouHupFPMdNFXNvfJwa2td2FniE=; b=TtmAG/64hSUb06/N5VTVeG4ILg7KxzWamK/XFL/ZG7At1ujQPrjF3po5l657zK5phG TkHgAkaDFEmlgBzEzWGyH8NJiIihtZnU5cQO0/eD/XIuhHTlF2AbuMzZm3z2Z1oLBJ3n icnsNwfU/PmL11SXFGJ0r+oohAhYrTU/Kvyf+rtuK8uU+lkG3ooivllcZzeJHWTbB+OQ y9xdomIJ8B55lDPYAIilVay/s+5av8mq1UpDct+VM6DEZKEIEnxr7MmDE285HN9HKGUH K2rtp2nM+XlkoSJCmHpoNiDX6qjRSaQCHnGZ9Plcxs6vpi37yBjeVZqFFvl1kfzjeH5j iCUg== X-Gm-Message-State: AGi0PubKXBekLDKzcohjjKUPvkkH6M6It5w0qg1ZMuCPx3y4uQe792N7 nWYoYtgMMkMk51Vr28lnLLgqzVMutGo= X-Google-Smtp-Source: APiQypKOM8MT743Eqlwx1O0EOtLg/Y5MXhOaG84u4WBEX/FDcvB3lv0gw+siVggne0kHWpU16r/gfQ== X-Received: by 2002:a17:902:b101:: with SMTP id q1mr12023313plr.246.1587783652226; Fri, 24 Apr 2020 20:00:52 -0700 (PDT) Received: from localhost.localdomain ([2409:4064:79a:d9e8:1f9e:c3b5:9fc6:c4b2]) by smtp.gmail.com with ESMTPSA id f99sm5990992pjg.22.2020.04.24.20.00.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 20:00:51 -0700 (PDT) From: Abhishek Kumar To: git@vger.kernel.org Subject: [PATCH v3 3/3] oidmap: return oidmap_entry pointers Date: Sat, 25 Apr 2020 08:29:21 +0530 Message-Id: <20200425025921.1397-3-abhishekkumar8222@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200425025921.1397-1-abhishekkumar8222@gmail.com> References: <20200408040659.14511-1-abhishekkumar8222@gmail.com> <20200425025921.1397-1-abhishekkumar8222@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org oidmap_entry is usually embedded as first member of user data structures. Since oidmap is unaware of structure, it returns an void pointer for oidmap_get(), oidmap_put() and oidmap_remove(). This pointer is rather a pointer to a oidmap entry. Teach the functions to return a oidmap_entry pointer and add helper macros to return pointers to container struct. Signed-off-by: Abhishek Kumar --- list-objects-filter.c | 8 +++++--- oidmap.c | 21 ++++++++++++--------- oidmap.h | 42 ++++++++++++++++++++++++++++++++++++------ replace-object.c | 7 ++++--- sequencer.c | 28 ++++++++++++++++++---------- t/helper/test-oidmap.c | 8 +++++--- 6 files changed, 80 insertions(+), 34 deletions(-) diff --git a/list-objects-filter.c b/list-objects-filter.c index 1e8d4e763d..16b45d913e 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -183,13 +183,15 @@ static enum list_objects_filter_result filter_trees_depth( return include_it ? LOFR_MARK_SEEN | LOFR_DO_SHOW : LOFR_ZERO; case LOFS_BEGIN_TREE: - seen_info = oidmap_get( - &filter_data->seen_at_depth, &obj->oid); + oidmap_get_entry(seen_info, base, &filter_data->seen_at_depth, + &obj->oid); + if (!seen_info) { seen_info = xcalloc(1, sizeof(*seen_info)); oidcpy(&seen_info->base.oid, &obj->oid); seen_info->depth = filter_data->current_depth; - oidmap_put(&filter_data->seen_at_depth, seen_info); + oidmap_put_entry(seen_info, base, + &filter_data->seen_at_depth); already_seen = 0; } else { already_seen = diff --git a/oidmap.c b/oidmap.c index 44345a8cf2..0e64c0e8a2 100644 --- a/oidmap.c +++ b/oidmap.c @@ -33,15 +33,18 @@ void oidmap_free(struct oidmap *map, int free_entries) hashmap_free(&map->map); } -void *oidmap_get(const struct oidmap *map, const struct object_id *key) +struct oidmap_entry *oidmap_get(const struct oidmap *map, + const struct object_id *key) { if (!map->map.cmpfn) return NULL; - return hashmap_get_from_hash(&map->map, oidhash(key), key); + return oidmap_entry_from_hashmap_entry( + hashmap_get_from_hash(&map->map, oidhash(key), key)); } -void *oidmap_remove(struct oidmap *map, const struct object_id *key) +struct oidmap_entry *oidmap_remove(struct oidmap *map, + const struct object_id *key) { struct hashmap_entry entry; @@ -49,16 +52,16 @@ void *oidmap_remove(struct oidmap *map, const struct object_id *key) oidmap_init(map, 0); hashmap_entry_init(&entry, oidhash(key)); - return hashmap_remove(&map->map, &entry, key); + return oidmap_entry_from_hashmap_entry( + hashmap_remove(&map->map, &entry, key)); } -void *oidmap_put(struct oidmap *map, void *entry) +struct oidmap_entry *oidmap_put(struct oidmap *map, struct oidmap_entry *entry) { - struct oidmap_entry *to_put = entry; - if (!map->map.cmpfn) oidmap_init(map, 0); - hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid)); - return hashmap_put(&map->map, &to_put->internal_entry); + hashmap_entry_init(&entry->internal_entry, oidhash(&entry->oid)); + return oidmap_entry_from_hashmap_entry( + hashmap_put(&map->map, &entry->internal_entry)); } diff --git a/oidmap.h b/oidmap.h index d79b087ab0..f250f0bf87 100644 --- a/oidmap.h +++ b/oidmap.h @@ -46,25 +46,55 @@ void oidmap_free(struct oidmap *map, int free_entries); /* * Returns the oidmap entry for the specified oid, or NULL if not found. */ -void *oidmap_get(const struct oidmap *map, +struct oidmap_entry *oidmap_get(const struct oidmap *map, const struct object_id *key); +/* + * Returns pointer to container struct of the oidmap entry for the + * specified oid, or NULL if not found. + */ +#define oidmap_get_entry(var, member, map, key) \ + var = container_of_or_null_offset( \ + oidmap_get(map, key), \ + OFFSETOF_VAR(var, member)) /* * Adds or replaces an oidmap entry. * - * ((struct oidmap_entry *) entry)->internal_entry will be populated by this - * function. - * * Returns the replaced entry, or NULL if not found (i.e. the entry was added). */ -void *oidmap_put(struct oidmap *map, void *entry); +struct oidmap_entry *oidmap_put(struct oidmap *map, struct oidmap_entry *entry); + +/* + * Adds or replaces an oidmap entry. + * + * Returns pointer to container struct of replaced entry, or NULL if + * not found (i.e. the entry was added). + * + * The struct type of @var contains a "struct oidmap_entry" @member. + */ +#define oidmap_put_entry(var, member, map) \ + container_of_or_null_offset( \ + oidmap_put(map, &var->member), \ + OFFSETOF_VAR(var, member)) /* * Removes an oidmap entry matching the specified oid. * * Returns the removed entry, or NULL if not found. */ -void *oidmap_remove(struct oidmap *map, const struct object_id *key); +struct oidmap_entry *oidmap_remove(struct oidmap *map, + const struct object_id *key); + +/* + * Removes an oidmap entry matching the specified oid. + * + * Returns pointer to container struct of the removed entry, or NULL if + * not found. + */ +#define oidmap_remove_entry(var, member, map, key) \ + var = container_of_or_null_offset( \ + oidmap_remove(map, key), \ + OFFSETOF_VAR(var, member)) #define oidmap_entry_from_hashmap_entry(entry) \ container_of_or_null(entry, struct oidmap_entry, internal_entry) diff --git a/replace-object.c b/replace-object.c index 7bd9aba6ee..ab0354db7a 100644 --- a/replace-object.c +++ b/replace-object.c @@ -26,7 +26,7 @@ static int register_replace_ref(struct repository *r, oidcpy(&repl_obj->replacement, oid); /* Register new object */ - if (oidmap_put(r->objects->replace_map, repl_obj)) + if (oidmap_put_entry(repl_obj, original, r->objects->replace_map)) die(_("duplicate replace ref: %s"), refname); return 0; @@ -73,8 +73,9 @@ const struct object_id *do_lookup_replace_object(struct repository *r, /* Try to recursively replace the object */ while (depth-- > 0) { - struct replace_object *repl_obj = - oidmap_get(r->objects->replace_map, cur); + struct replace_object *repl_obj; + oidmap_get_entry(repl_obj, original, r->objects->replace_map, + cur); if (!repl_obj) return cur; cur = &repl_obj->replacement; diff --git a/sequencer.c b/sequencer.c index f30bb73c70..012e7865db 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4506,7 +4506,8 @@ static const char *label_oid(struct object_id *oid, const char *label, struct object_id dummy; int i; - string_entry = oidmap_get(&state->commit2label, oid); + oidmap_get_entry(string_entry, entry, &state->commit2label, oid); + if (string_entry) return string_entry->string; @@ -4606,7 +4607,7 @@ static const char *label_oid(struct object_id *oid, const char *label, FLEX_ALLOC_STR(string_entry, string, label); oidcpy(&string_entry->entry.oid, oid); - oidmap_put(&state->commit2label, string_entry); + oidmap_put_entry(string_entry, entry, &state->commit2label); return string_entry->string; } @@ -4645,7 +4646,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, struct object_id *oid = &revs->cmdline.rev[0].item->oid; FLEX_ALLOC_STR(entry, string, "onto"); oidcpy(&entry->entry.oid, oid); - oidmap_put(&state.commit2label, entry); + oidmap_put_entry(entry, entry, /* member name */ + &state.commit2label); FLEX_ALLOC_STR(onto_label_entry, label, "onto"); hashmap_entry_init(&onto_label_entry->entry, strihash("onto")); @@ -4689,7 +4691,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, FLEX_ALLOC_STR(entry, string, buf.buf); oidcpy(&entry->entry.oid, &commit->object.oid); - oidmap_put(&commit2todo, entry); + oidmap_put_entry(entry, entry, /* member name */ + &commit2todo); continue; } @@ -4731,7 +4734,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, FLEX_ALLOC_STR(entry, string, buf.buf); oidcpy(&entry->entry.oid, &commit->object.oid); - oidmap_put(&commit2todo, entry); + oidmap_put_entry(entry, entry, /* member name */ + &commit2todo); } /* @@ -4769,7 +4773,9 @@ static int make_script_with_merges(struct pretty_print_context *pp, commit = iter->item; if (oidset_contains(&shown, &commit->object.oid)) continue; - entry = oidmap_get(&state.commit2label, &commit->object.oid); + + oidmap_get_entry(entry, entry /* member name */, + &state.commit2label, &commit->object.oid); if (entry) strbuf_addf(out, "\n%c Branch %s\n", comment_line_char, entry->string); @@ -4793,8 +4799,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, else { const char *to = NULL; - entry = oidmap_get(&state.commit2label, - &commit->object.oid); + oidmap_get_entry(entry, entry /* member name */, + &state.commit2label, &commit->object.oid); if (entry) to = entry->string; else if (!rebase_cousins) @@ -4813,11 +4819,13 @@ static int make_script_with_merges(struct pretty_print_context *pp, for (iter2 = list; iter2; iter2 = iter2->next) { struct object_id *oid = &iter2->item->object.oid; - entry = oidmap_get(&commit2todo, oid); + oidmap_get_entry(entry, entry /* member name */, + &commit2todo, oid); /* only show if not already upstream */ if (entry) strbuf_addf(out, "%s\n", entry->string); - entry = oidmap_get(&state.commit2label, oid); + oidmap_get_entry(entry, entry /* member name */, + &state.commit2label, oid); if (entry) strbuf_addf(out, "%s %s\n", cmd_label, entry->string); diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c index 3f599b21b8..fc19c1cb8e 100644 --- a/t/helper/test-oidmap.c +++ b/t/helper/test-oidmap.c @@ -59,7 +59,7 @@ int cmd__oidmap(int argc, const char **argv) oidcpy(&entry->entry.oid, &oid); /* add / replace entry */ - entry = oidmap_put(&map, entry); + entry = oidmap_put_entry(entry, entry, /* member name */ &map); /* print and free replaced entry, if any */ puts(entry ? entry->name : "NULL"); @@ -73,7 +73,8 @@ int cmd__oidmap(int argc, const char **argv) } /* lookup entry in oidmap */ - entry = oidmap_get(&map, &oid); + oidmap_get_entry(entry, entry /* member name */, + &map, &oid); /* print result */ puts(entry ? entry->name : "NULL"); @@ -86,7 +87,8 @@ int cmd__oidmap(int argc, const char **argv) } /* remove entry from oidmap */ - entry = oidmap_remove(&map, &oid); + oidmap_remove_entry(entry, entry, /* member name */ + &map, &oid); /* print result and free entry*/ puts(entry ? entry->name : "NULL");