diff options
author | Nicolas Pitre <nico@cam.org> | 2007-02-26 14:55:59 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-27 01:34:21 -0800 |
commit | 21666f1aae4e890d8f50924f9e80763b27e6a45d (patch) | |
tree | 462de5be3e949924f58858e08e24355f613191ab /mktag.c | |
parent | df8436622fb553f468180b61032fe34bd6712752 (diff) | |
download | git-21666f1aae4e890d8f50924f9e80763b27e6a45d.tar.gz |
convert object type handling from a string to a number
We currently have two parallel notation for dealing with object types
in the code: a string and a numerical value. One of them is obviously
redundent, and the most used one requires more stack space and a bunch
of strcmp() all over the place.
This is an initial step for the removal of the version using a char array
found in object reading code paths. The patch is unfortunately large but
there is no sane way to split it in smaller parts without breaking the
system.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'mktag.c')
-rw-r--r-- | mktag.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -27,13 +27,13 @@ static int verify_object(unsigned char *sha1, const char *expected_type) { int ret = -1; - char type[100]; + enum object_type type; unsigned long size; - void *buffer = read_sha1_file(sha1, type, &size); + void *buffer = read_sha1_file(sha1, &type, &size); if (buffer) { - if (!strcmp(type, expected_type)) - ret = check_sha1_signature(sha1, buffer, size, type); + if (type == type_from_string(expected_type)) + ret = check_sha1_signature(sha1, buffer, size, expected_type); free(buffer); } return ret; |