diff options
| -rw-r--r-- | attr.c | 2 | ||||
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rw-r--r-- | hashmap.h | 4 | ||||
| -rw-r--r-- | merge-recursive.h | 4 | ||||
| -rw-r--r-- | ref-filter.c | 2 | ||||
| -rw-r--r-- | refs.c | 2 | ||||
| -rw-r--r-- | remote.h | 2 | ||||
| -rw-r--r-- | sub-process.h | 2 | ||||
| -rw-r--r-- | t/helper/test-hashmap.c | 1 |
9 files changed, 11 insertions, 10 deletions
@@ -62,7 +62,7 @@ static struct attr_hashmap g_attr_hashmap; /* The container for objects stored in "struct attr_hashmap" */ struct attr_hash_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; const char *key; /* the key; memory should be owned by value */ size_t keylen; /* length of the key */ void *value; /* the stored value */ diff --git a/builtin/fetch.c b/builtin/fetch.c index 09f7170616..a3154a4edb 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -251,7 +251,7 @@ static int will_fetch(struct ref **head, const unsigned char *sha1) } struct refname_hash_entry { - struct hashmap_entry ent; /* must be the first member */ + struct hashmap_entry ent; struct object_id oid; int ignore; char refname[FLEX_ARRAY]; @@ -13,7 +13,7 @@ * * struct hashmap map; * struct long2string { - * struct hashmap_entry ent; // must be the first member! + * struct hashmap_entry ent; * long key; * char value[FLEX_ARRAY]; // be careful with allocating on stack! * }; @@ -141,7 +141,7 @@ static inline unsigned int oidhash(const struct object_id *oid) /* * struct hashmap_entry is an opaque structure representing an entry in the - * hash table, which must be used as first member of user data structures. + * hash table. * Ideally it should be followed by an int-sized member to prevent unused * memory on 64-bit systems due to alignment. */ diff --git a/merge-recursive.h b/merge-recursive.h index c2b7bb65c6..daa742568e 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -50,7 +50,7 @@ struct merge_options { * in get_directory_renames() for details */ struct dir_rename_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; char *dir; unsigned non_unique_new_dir:1; struct strbuf new_dir; @@ -58,7 +58,7 @@ struct dir_rename_entry { }; struct collision_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; char *target_file; struct string_list source_files; unsigned reported_already:1; diff --git a/ref-filter.c b/ref-filter.c index 0950b789e3..5c10a343c6 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -79,7 +79,7 @@ static struct expand_data { } oi, oi_deref; struct ref_to_worktree_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; struct worktree *wt; /* key is wt->head_ref */ }; @@ -1772,7 +1772,7 @@ int resolve_gitlink_ref(const char *submodule, const char *refname, struct ref_store_hash_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; struct ref_store *refs; @@ -14,7 +14,7 @@ enum { }; struct remote { - struct hashmap_entry ent; /* must be first */ + struct hashmap_entry ent; const char *name; int origin, configured_in_repo; diff --git a/sub-process.h b/sub-process.h index 0d12708b8c..e85f21fa1a 100644 --- a/sub-process.h +++ b/sub-process.h @@ -24,7 +24,7 @@ /* Members should not be accessed directly. */ struct subprocess_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; const char *cmd; struct child_process process; }; diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c index cc577c8956..f38706216f 100644 --- a/t/helper/test-hashmap.c +++ b/t/helper/test-hashmap.c @@ -5,6 +5,7 @@ struct test_entry { + int padding; /* hashmap entry no longer needs to be the first member */ struct hashmap_entry ent; /* key and value as two \0-terminated strings */ char key[FLEX_ARRAY]; |