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 /archive-tar.c | |
| parent | df8436622fb553f468180b61032fe34bd6712752 (diff) | |
| download | git-21666f1aae4e890d8f50924f9e80763b27e6a45d.tar.gz git-21666f1aae4e890d8f50924f9e80763b27e6a45d.tar.xz | |
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 'archive-tar.c')
| -rw-r--r-- | archive-tar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archive-tar.c b/archive-tar.c index 7d52a061f..d9c30d33d 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -262,7 +262,7 @@ static int write_tar_entry(const unsigned char *sha1, static struct strbuf path; int filenamelen = strlen(filename); void *buffer; - char type[20]; + enum object_type type; unsigned long size; if (!path.alloc) { @@ -283,7 +283,7 @@ static int write_tar_entry(const unsigned char *sha1, buffer = NULL; size = 0; } else { - buffer = read_sha1_file(sha1, type, &size); + buffer = read_sha1_file(sha1, &type, &size); if (!buffer) die("cannot read %s", sha1_to_hex(sha1)); } |