# [PATCH] Remove redundant code, eliminate one static variable 2 messages from 2008-05-23 to 2008-05-25. Participants: Heikki Orsila, Junio C Hamano. Thread: https://gitlist.dev/t/13644 ## Heikki Orsila, 2008-05-23 22:43 Subject: [PATCH] Remove redundant code, eliminate one static variable Message-ID: <20080523224355.GA16878@zakalwe.fi> URL: https://gitlist.dev/e/20080523224355.GA16878%40zakalwe.fi ``` Signed-off-by: Heikki Orsila --- sha1_file.c | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 3516777..e8751d0 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -176,21 +176,22 @@ char *sha1_file_name(const unsigned char *sha1) 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 char *name, *base, *buf; + char *buf; int i; - if (!base) { + if (!*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.pack", sha1_file_directory); - name = base + len + 11; + *base = xmalloc(len + 60); + sprintf(*base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory); + *name = *base + len + 11; } - buf = name; + buf = *name; for (i = 0; i < 20; i++) { unsigned int val = *sha1++; @@ -198,32 +199,21 @@ char *sha1_pack_name(const unsigned char *sha1) *buf++ = hex[val & 0xf]; } - return base; + return *base; } -char *sha1_pack_index_name(const unsigned char *sha1) +char *sha1_pack_name(const unsigned char *sha1) { - static const char hex[] = "0123456789abcdef"; - static char *name, *base, *buf; - int i; - - if (!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; - } + static char *name, *base; - buf = name; + return sha1_get_pack_name(sha1, &name, &base); +} - for (i = 0; i < 20; i++) { - unsigned int val = *sha1++; - *buf++ = hex[val >> 4]; - *buf++ = hex[val & 0xf]; - } +char *sha1_pack_index_name(const unsigned char *sha1) +{ + static char *name, *base; - return base; + return sha1_get_pack_name(sha1, &name, &base); } struct alternate_object_database *alt_odb_list; -- 1.5.5.1.1.ga5e5c ``` ## Junio C Hamano, 2008-05-25 05:12 Subject: Re: [PATCH] Remove redundant code, eliminate one static variable Message-ID: <7vhccnj7b9.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vhccnj7b9.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20080523224355.GA16878@zakalwe.fi> ``` Thanks. ```