X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=blob.c;h=7377008744430cea453010fe93e6c1f51c37fdde;hp=84ec1212e7010b8cbf535355d4114eded3007672;hb=HEAD;hpb=8fc11b5aa98540f7caab87e22e5aae63512893a2

diff --git a/blob.c b/blob.c
index 84ec1212..73770087 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 = xcalloc(1, sizeof(struct blob));
 		created_object(sha1, &ret->object);
-		ret->object.type = blob_type;
+		ret->object.type = TYPE_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 = TYPE_BLOB;
+	if (obj->type != TYPE_BLOB) {
+		error("Object %s is a %s, not a blob",
+		      sha1_to_hex(sha1), typename(obj->type));
 		return NULL;
 	}
 	return (struct blob *) obj;