X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=blob.c;h=bd7d078e1ae5fe4ce0a16fda62a2c1743237941b;hb=61397d4b8da2f2ab3fd767c6058ad05ca10269b8;hp=d1af2e62f14965fab491a3d9dde712f02b718adc;hpb=09f5dc406a9e6630af881108af815f6c3fb6d9df;p=git.git

diff --git a/blob.c b/blob.c
index d1af2e62f..bd7d078e1 100644
--- a/blob.c
+++ b/blob.c
@@ -1,18 +1,13 @@
 #include "cache.h"
 #include "blob.h"
-#include <stdlib.h>
 
 const char *blob_type = "blob";
 
 struct blob *lookup_blob(const unsigned char *sha1)
 {
 	struct object *obj = lookup_object(sha1);
-	if (!obj) {
-		struct blob *ret = alloc_blob_node();
-		created_object(sha1, &ret->object);
-		ret->object.type = OBJ_BLOB;
-		return ret;
-	}
+	if (!obj)
+		return create_object(sha1, OBJ_BLOB, alloc_blob_node());
 	if (!obj->type)
 		obj->type = OBJ_BLOB;
 	if (obj->type != OBJ_BLOB) {
@@ -31,18 +26,18 @@ int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
 
 int parse_blob(struct blob *item)
 {
-        char type[20];
+        enum object_type type;
         void *buffer;
         unsigned long size;
 	int ret;
 
         if (item->object.parsed)
                 return 0;
-        buffer = read_sha1_file(item->object.sha1, type, &size);
+        buffer = read_sha1_file(item->object.sha1, &type, &size);
         if (!buffer)
                 return error("Could not read %s",
                              sha1_to_hex(item->object.sha1));
-        if (strcmp(type, blob_type))
+        if (type != OBJ_BLOB)
                 return error("Object %s not a blob",
                              sha1_to_hex(item->object.sha1));
 	ret = parse_blob_buffer(item, buffer, size);