X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=blob.c;h=d1af2e62f14965fab491a3d9dde712f02b718adc;hb=42cabc341c4e6da3c9873db7af1003bd1a72a8fd;hp=c1fdd861c3dedbbd670fcf07989501fd0f9b5fda;hpb=810e1523753553968aac827f57e0e24fc9af6546;p=git.git diff --git a/blob.c b/blob.c index c1fdd861c..d1af2e62f 100644 --- a/blob.c +++ b/blob.c @@ -8,16 +8,16 @@ struct blob *lookup_blob(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { - struct blob *ret = xcalloc(1, sizeof(struct blob)); + struct blob *ret = alloc_blob_node(); created_object(sha1, &ret->object); - ret->object.type = blob_type; + ret->object.type = OBJ_BLOB; return ret; } if (!obj->type) - obj->type = blob_type; - if (obj->type != blob_type) { - error("Object %s is a %s, not a blob", - sha1_to_hex(sha1), obj->type); + obj->type = OBJ_BLOB; + if (obj->type != OBJ_BLOB) { + error("Object %s is a %s, not a blob", + sha1_to_hex(sha1), typename(obj->type)); return NULL; } return (struct blob *) obj;