undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant code, eliminate one static variable

Browse Source 
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Heikki Orsila 2008-05-24 01:43:55 +03:00 committed by Junio C Hamano
parent 998b912927
commit 633f43e1f7
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sha1_file.c
View File

@ -176,21 +176,22 @@ char *sha1_file_name(const unsigned char *sha1)
return base; return base;
} }
char *sha1_pack_name(const unsigned char *sha1) static char *sha1_get_pack_name(const unsigned char *sha1,
char **name, char **base)
{ {
static const char hex[] = "0123456789abcdef"; static const char hex[] = "0123456789abcdef";
static char *name, *base, *buf; char *buf;
int i; int i;
if (!base) { if (!*base) {
const char *sha1_file_directory = get_object_directory(); const char *sha1_file_directory = get_object_directory();
int len = strlen(sha1_file_directory); int len = strlen(sha1_file_directory);
base = xmalloc(len + 60); *base = xmalloc(len + 60);
sprintf(base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory); sprintf(*base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory);
name = base + len + 11; *name = *base + len + 11;
} }
buf = name; buf = *name;
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
unsigned int val = *sha1++; unsigned int val = *sha1++;
@ -198,32 +199,21 @@ char *sha1_pack_name(const unsigned char *sha1)
*buf++ = hex[val & 0xf]; *buf++ = hex[val & 0xf];
} }
return base; return *base;
}
char *sha1_pack_name(const unsigned char *sha1)
{
static char *name, *base;
return sha1_get_pack_name(sha1, &name, &base);
} }
char *sha1_pack_index_name(const unsigned char *sha1) char *sha1_pack_index_name(const unsigned char *sha1)
{ {
static const char hex[] = "0123456789abcdef"; static char *name, *base;
static char *name, *base, *buf;
int i;
if (!base) { return sha1_get_pack_name(sha1, &name, &base);
const char *sha1_file_directory = get_object_directory();
int len = strlen(sha1_file_directory);
base = xmalloc(len + 60);
sprintf(base, "%s/pack/pack-1234567890123456789012345678901234567890.idx", sha1_file_directory);
name = base + len + 11;
}
buf = name;
for (i = 0; i < 20; i++) {
unsigned int val = *sha1++;
*buf++ = hex[val >> 4];
*buf++ = hex[val & 0xf];
}
return base;
} }
struct alternate_object_database *alt_odb_list; struct alternate_object_database *alt_odb_list;