path: root/combine-diff.c
diff options
authorNicolas Pitre <>2007-02-26 19:55:59 (GMT)
committerJunio C Hamano <>2007-02-27 09:34:21 (GMT)
commit21666f1aae4e890d8f50924f9e80763b27e6a45d (patch)
tree462de5be3e949924f58858e08e24355f613191ab /combine-diff.c
parentdf8436622fb553f468180b61032fe34bd6712752 (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'combine-diff.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 044633d..9daa0cb 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -92,14 +92,14 @@ struct sline {
static char *grab_blob(const unsigned char *sha1, unsigned long *size)
char *blob;
- char type[20];
+ enum object_type type;
if (is_null_sha1(sha1)) {
/* deleted blob */
*size = 0;
return xcalloc(1, 1);
- blob = read_sha1_file(sha1, type, size);
- if (strcmp(type, blob_type))
+ blob = read_sha1_file(sha1, &type, size);
+ if (type != OBJ_BLOB)
die("object '%s' is not a blob!", sha1_to_hex(sha1));
return blob;