summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-06 23:30:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 01:20:11 (GMT)
commit23dee69f53cf5024ca79e0b707dcb03c63f33bef (patch)
treee99f2fd2a4e1fe622451eeaafa8c37b40413ec10 /builtin/describe.c
parentc8e424c9c94d97b18cd335be17f32a8ce94a5b7f (diff)
downloadgit-23dee69f53cf5024ca79e0b707dcb03c63f33bef.zip
git-23dee69f53cf5024ca79e0b707dcb03c63f33bef.tar.gz
git-23dee69f53cf5024ca79e0b707dcb03c63f33bef.tar.bz2
OFFSETOF_VAR macro to simplify hashmap iterators
While we cannot rely on a `__typeof__' operator being portable to use with `offsetof'; we can calculate the pointer offset using an existing pointer and the address of a member using pointer arithmetic for compilers without `__typeof__'. This allows us to simplify usage of hashmap iterator macros by not having to specify a type when a pointer of that type is already given. In the future, list iterator macros (e.g. list_for_each_entry) may also be implemented using OFFSETOF_VAR to save hackers the trouble of using container_of/list_entry macros and without relying on non-portable `__typeof__'. v3: use `__typeof__' to avoid clang warnings 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 'builtin/describe.c')
-rw-r--r--builtin/describe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index 8cf2cd9..1caf98f 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -333,7 +333,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
struct commit_name *n;
init_commit_names(&commit_names);
- hashmap_for_each_entry(&names, &iter, n, struct commit_name,
+ hashmap_for_each_entry(&names, &iter, n,
entry /* member name */) {
c = lookup_commit_reference_gently(the_repository,
&n->peeled, 1);