fix sha1_pack_index_name()

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>

Junio C Hamano committed May 28, 2008 at 09:47 UTC 6eec46bdda7393f1801df70a44d2e0577760a691

1 file changed +5 -4

sha1_file.c

+5 -4

@@ -177,7 +177,7 @@ char *sha1_file_name(const unsigned char *sha1)

177 }

178

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 {

182 static const char hex[] = "0123456789abcdef";

183 char *buf;

@@ -187,7 +187,8 @@ static char *sha1_get_pack_name(const unsigned char *sha1,

187 const char *sha1_file_directory = get_object_directory();

188 int len = strlen(sha1_file_directory);

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);

192 *name = *base + len + 11;

193 }

194

@@ -206,14 +207,14 @@ char *sha1_pack_name(const unsigned char *sha1)

207 {

208 static char *name, *base;

209

209 - return sha1_get_pack_name(sha1, &name, &base);

210 + return sha1_get_pack_name(sha1, &name, &base, "pack");

211 }

212

213 char *sha1_pack_index_name(const unsigned char *sha1)

214 {

215 static char *name, *base;

216

216 - return sha1_get_pack_name(sha1, &name, &base);

217 + return sha1_get_pack_name(sha1, &name, &base, "idx");

218 }

219

220 struct alternate_object_database *alt_odb_list;