Merge branch 'maint'

gitster · gitster · commit 22c430ad8468 · 2008-02-22T14:01:43.000-08:00
* maint:
  hash: fix lookup_hash semantics
diff --git a/hash.c b/hash.c
@@ -70,7 +70,7 @@ void *lookup_hash(unsigned int hash, struct hash_table *table)
 {
 	if (!table->array)
 		return NULL;
-	return &lookup_hash_entry(hash, table)->ptr;
+	return lookup_hash_entry(hash, table)->ptr;
 }
 
 void **insert_hash(unsigned int hash, void *ptr, struct hash_table *table)

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void lookup_hash(unsigned int hash, struct hash_table table)`
`70`	`70`	`{`
`71`	`71`	`if (!table->array)`
`72`	`72`	`return NULL;`
`73`		`- return &lookup_hash_entry(hash, table)->ptr;`
	`73`	`+ return lookup_hash_entry(hash, table)->ptr;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`void *insert_hash(unsigned int hash, void ptr, struct hash_table *table)`