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

diff --git a/blob.c b/blob.c
index c800cd39..73770087 100644
--- a/blob.c
+++ b/blob.c
@@ -1,24 +1,23 @@
-#include "blob.h"
 #include "cache.h"
+#include "blob.h"
 #include <stdlib.h>
 
 const char *blob_type = "blob";
 
-struct blob *lookup_blob(unsigned char *sha1)
+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;