ci: fix GCC install in the Travis CI GCC OSX job

[thirdparty/git.git] / name-hash.c

diff --git a/name-hash.c b/name-hash.c
index c86fe0f1df0b95c125eecc580ee47a0788bd9632..ceb1d7bd6f7c594160b8162f306afb37556dc0e5 100644 (file)
--- a/name-hash.c
+++ b/name-hash.c
@@ -37,8 +37,7 @@ static struct dir_entry *find_dir_entry__hash(struct index_state *istate,
        struct dir_entry key;
        hashmap_entry_init(&key.ent, hash);
        key.namelen = namelen;
-       return hashmap_get_entry(&istate->dir_hash, &key, name,
-                                       struct dir_entry, ent);
+       return hashmap_get_entry(&istate->dir_hash, &key, ent, name);
 }
 
 static struct dir_entry *find_dir_entry(struct index_state *istate,
@@ -714,8 +713,7 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
 
        ce = hashmap_get_entry_from_hash(&istate->name_hash, hash, NULL,
                                         struct cache_entry, ent);
-       hashmap_for_each_entry_from(&istate->name_hash, ce,
-                                       struct cache_entry, ent) {
+       hashmap_for_each_entry_from(&istate->name_hash, ce, ent) {
                if (same_name(ce, name, namelen, icase))
                        return ce;
        }