fix sha1_pack_index_name()

gitster · gitster · commit 6eec46bdda73 · 2008-05-28T10:24:32.000-07:00
An earlier commit 633f43e (Remove redundant code, eliminate one static variable, 2008-05-24) had a thinko (perhaps an eyeno) that broke sha1_pack_index_name() function. One symptom of this was that the http walker is now completely broken. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/sha1_file.c b/sha1_file.c
@@ -177,7 +177,7 @@ char *sha1_file_name(const unsigned char *sha1)
 }
 
 static char *sha1_get_pack_name(const unsigned char *sha1,
-				char **name, char **base)
+				char **name, char **base, const char *which)
 {
 	static const char hex[] = "0123456789abcdef";
 	char *buf;
@@ -187,7 +187,8 @@ static char *sha1_get_pack_name(const unsigned char *sha1,
 		const char *sha1_file_directory = get_object_directory();
 		int len = strlen(sha1_file_directory);
 		*base = xmalloc(len + 60);
-		sprintf(*base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory);
+		sprintf(*base, "%s/pack/pack-1234567890123456789012345678901234567890.%s",
+			sha1_file_directory, which);
 		*name = *base + len + 11;
 	}
 
@@ -206,14 +207,14 @@ char *sha1_pack_name(const unsigned char *sha1)
 {
 	static char *name, *base;
 
-	return sha1_get_pack_name(sha1, &name, &base);
+	return sha1_get_pack_name(sha1, &name, &base, "pack");
 }
 
 char *sha1_pack_index_name(const unsigned char *sha1)
 {
 	static char *name, *base;
 
-	return sha1_get_pack_name(sha1, &name, &base);
+	return sha1_get_pack_name(sha1, &name, &base, "idx");
 }
 
 struct alternate_object_database *alt_odb_list;

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ char sha1_file_name(const unsigned char sha1)`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`static char sha1_get_pack_name(const unsigned char sha1,`
`180`		`- char name, char base)`
	`180`	`+ char name, char base, const char *which)`
`181`	`181`	`{`
`182`	`182`	`static const char hex[] = "0123456789abcdef";`
`183`	`183`	`char *buf;`
`@@ -187,7 +187,8 @@ static char sha1_get_pack_name(const unsigned char sha1,`
`187`	`187`	`const char *sha1_file_directory = get_object_directory();`
`188`	`188`	`int len = strlen(sha1_file_directory);`
`189`	`189`	`*base = xmalloc(len + 60);`
`190`		`- sprintf(*base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory);`
	`190`	`+ sprintf(*base, "%s/pack/pack-1234567890123456789012345678901234567890.%s",`
	`191`	`+ sha1_file_directory, which);`
`191`	`192`	`name = base + len + 11;`
`192`	`193`	`}`
`193`	`194`
`@@ -206,14 +207,14 @@ char sha1_pack_name(const unsigned char sha1)`
`206`	`207`	`{`
`207`	`208`	`static char name, base;`
`208`	`209`
`209`		`- return sha1_get_pack_name(sha1, &name, &base);`
	`210`	`+ return sha1_get_pack_name(sha1, &name, &base, "pack");`
`210`	`211`	`}`
`211`	`212`
`212`	`213`	`char sha1_pack_index_name(const unsigned char sha1)`
`213`	`214`	`{`
`214`	`215`	`static char name, base;`
`215`	`216`
`216`		`- return sha1_get_pack_name(sha1, &name, &base);`
	`217`	`+ return sha1_get_pack_name(sha1, &name, &base, "idx");`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`struct alternate_object_database *alt_odb_list;`