get_packed_refs(): take a packed_ref_store * parameter

mhagger · gitster · commit a9169f5dc2ca · 2017-06-23T13:27:32.000-07:00
It only cares about the packed-refs part of the reference store.

Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs/files-backend.c b/refs/files-backend.c
@@ -427,9 +427,9 @@ static struct ref_dir *get_packed_ref_dir(struct packed_ref_cache *packed_ref_ca
 	return get_ref_dir(packed_ref_cache->cache->root);
 }
 
-static struct ref_dir *get_packed_refs(struct files_ref_store *refs)
+static struct ref_dir *get_packed_refs(struct packed_ref_store *refs)
 {
-	return get_packed_ref_dir(get_packed_ref_cache(refs->packed_ref_store));
+	return get_packed_ref_dir(get_packed_ref_cache(refs));
 }
 
 /*
@@ -450,7 +450,7 @@ static void add_packed_ref(struct files_ref_store *refs,
 	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
 		die("Reference has invalid format: '%s'", refname);
 
-	packed_refs = get_packed_refs(refs);
+	packed_refs = get_packed_refs(refs->packed_ref_store);
 	packed_entry = find_ref_entry(packed_refs, refname);
 	if (packed_entry) {
 		/* Overwrite the existing entry: */
@@ -592,7 +592,7 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
 static struct ref_entry *get_packed_ref(struct files_ref_store *refs,
 					const char *refname)
 {
-	return find_ref_entry(get_packed_refs(refs), refname);
+	return find_ref_entry(get_packed_refs(refs->packed_ref_store), refname);
 }
 
 /*
@@ -1633,7 +1633,7 @@ static int repack_without_refs(struct files_ref_store *refs,
 		unable_to_lock_message(refs->packed_ref_store->path, errno, err);
 		return -1;
 	}
-	packed = get_packed_refs(refs);
+	packed = get_packed_refs(refs->packed_ref_store);
 
 	/* Remove refnames from the cache */
 	for_each_string_list_item(refname, refnames)

Original file line number	Diff line number	Diff line change
`@@ -427,9 +427,9 @@ static struct ref_dir get_packed_ref_dir(struct packed_ref_cache packed_ref_ca`
`427`	`427`	`return get_ref_dir(packed_ref_cache->cache->root);`
`428`	`428`	`}`
`429`	`429`
`430`		`-static struct ref_dir get_packed_refs(struct files_ref_store refs)`
	`430`	`+static struct ref_dir get_packed_refs(struct packed_ref_store refs)`
`431`	`431`	`{`
`432`		`- return get_packed_ref_dir(get_packed_ref_cache(refs->packed_ref_store));`
	`432`	`+ return get_packed_ref_dir(get_packed_ref_cache(refs));`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`/*`
`@@ -450,7 +450,7 @@ static void add_packed_ref(struct files_ref_store *refs,`
`450`	`450`	`if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))`
`451`	`451`	`die("Reference has invalid format: '%s'", refname);`
`452`	`452`
`453`		`- packed_refs = get_packed_refs(refs);`
	`453`	`+ packed_refs = get_packed_refs(refs->packed_ref_store);`
`454`	`454`	`packed_entry = find_ref_entry(packed_refs, refname);`
`455`	`455`	`if (packed_entry) {`
`456`	`456`	`/* Overwrite the existing entry: */`
`@@ -592,7 +592,7 @@ static struct ref_cache get_loose_ref_cache(struct files_ref_store refs)`
`592`	`592`	`static struct ref_entry get_packed_ref(struct files_ref_store refs,`
`593`	`593`	`const char *refname)`
`594`	`594`	`{`
`595`		`- return find_ref_entry(get_packed_refs(refs), refname);`
	`595`	`+ return find_ref_entry(get_packed_refs(refs->packed_ref_store), refname);`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`/*`
`@@ -1633,7 +1633,7 @@ static int repack_without_refs(struct files_ref_store *refs,`
`1633`	`1633`	`unable_to_lock_message(refs->packed_ref_store->path, errno, err);`
`1634`	`1634`	`return -1;`
`1635`	`1635`	`}`
`1636`		`- packed = get_packed_refs(refs);`
	`1636`	`+ packed = get_packed_refs(refs->packed_ref_store);`
`1637`	`1637`
`1638`	`1638`	`/* Remove refnames from the cache */`
`1639`	`1639`	`for_each_string_list_item(refname, refnames)`