summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-06 23:30:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 01:20:11 (GMT)
commit87571c3f71ba41d89eef5202f8589daa26f984ca (patch)
treed3b072917efce49f3f95d7d48763a8dfc83ef211 /attr.c
parent939af16eac1608766273d3971598dbcc4fe09928 (diff)
downloadgit-87571c3f71ba41d89eef5202f8589daa26f984ca.zip
git-87571c3f71ba41d89eef5202f8589daa26f984ca.tar.gz
git-87571c3f71ba41d89eef5202f8589daa26f984ca.tar.bz2
hashmap: use *_entry APIs for iteration
Inspired by list_for_each_entry in the Linux kernel. Once again, these are somewhat compromised usability-wise by compilers lacking __typeof__ support. Signed-off-by: Eric Wong <e@80x24.org> Reviewed-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/attr.c b/attr.c
index 6053481..ca8be46 100644
--- a/attr.c
+++ b/attr.c
@@ -163,12 +163,13 @@ static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check)
if (size != check->all_attrs_nr) {
struct attr_hash_entry *e;
struct hashmap_iter iter;
- hashmap_iter_init(&map->map, &iter);
REALLOC_ARRAY(check->all_attrs, size);
check->all_attrs_nr = size;
- while ((e = hashmap_iter_next(&iter))) {
+ hashmap_for_each_entry(&map->map, &iter, e,
+ struct attr_hash_entry,
+ ent /* member name */) {
const struct git_attr *a = e->value;
check->all_attrs[a->attr_nr].attr = a;
}