X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=blob.c;h=d1af2e62f14965fab491a3d9dde712f02b718adc;hb=a2a3bf7b2baf0ff64c5b5ffc78d54be82d9967f1;hp=84ec1212e7010b8cbf535355d4114eded3007672;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git diff --git a/blob.c b/blob.c index 84ec1212e..d1af2e62f 100644 --- a/blob.c +++ b/blob.c @@ -8,17 +8,16 @@ struct blob *lookup_blob(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { - struct blob *ret = xmalloc(sizeof(struct blob)); - memset(ret, 0, 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;