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

show-index: switch hard-coded constants to the_hash_algo

Browse Source 
show-index uses a variety of hard-coded constants to enumerate the
values in pack indices.  Switch these hard-coded constants to use
the_hash_algo or GIT_MAX_RAWSZ, as appropriate, and convert one instance
of an unsigned char array to struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2019-08-18 20:04:09 +00:00 committed by Junio C Hamano
parent fee49308a1
commit 7962e046ff
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/show-index.c
View File

@ -11,6 +11,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
unsigned nr; unsigned nr;
unsigned int version; unsigned int version;
static unsigned int top_index[256]; static unsigned int top_index[256];
const unsigned hashsz = the_hash_algo->rawsz;
if (argc != 1) if (argc != 1)
usage(show_index_usage); usage(show_index_usage);
@ -36,9 +37,9 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
} }
if (version == 1) { if (version == 1) {
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
unsigned int offset, entry[6]; unsigned int offset, entry[(GIT_MAX_RAWSZ + 4) / sizeof(unsigned int)];
if (fread(entry, 4 + 20, 1, stdin) != 1) if (fread(entry, 4 + hashsz, 1, stdin) != 1)
die("unable to read entry %u/%u", i, nr); die("unable to read entry %u/%u", i, nr);
offset = ntohl(entry[0]); offset = ntohl(entry[0]);
printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1))); printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1)));
@ -46,13 +47,13 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
} else { } else {
unsigned off64_nr = 0; unsigned off64_nr = 0;
struct { struct {
unsigned char sha1[20]; struct object_id oid;
uint32_t crc; uint32_t crc;
uint32_t off; uint32_t off;
} *entries; } *entries;
ALLOC_ARRAY(entries, nr); ALLOC_ARRAY(entries, nr);
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
if (fread(entries[i].sha1, 20, 1, stdin) != 1) if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1)
die("unable to read sha1 %u/%u", i, nr); die("unable to read sha1 %u/%u", i, nr);
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
if (fread(&entries[i].crc, 4, 1, stdin) != 1) if (fread(&entries[i].crc, 4, 1, stdin) != 1)
@ -77,7 +78,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
} }
printf("%" PRIuMAX " %s (%08"PRIx32")\n", printf("%" PRIuMAX " %s (%08"PRIx32")\n",
(uintmax_t) offset, (uintmax_t) offset,
sha1_to_hex(entries[i].sha1), oid_to_hex(&entries[i].oid),
ntohl(entries[i].crc)); ntohl(entries[i].crc));
} }
free(entries); free(entries);