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

diff --git a/blob.c b/blob.c
index 625db439..73770087 100644
--- a/blob.c
+++ b/blob.c
@@ -1,42 +1,51 @@
-#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 != blob_type) {
-		error("Object %s is a %s, not a blob", 
-		      sha1_to_hex(sha1), obj->type);
+	if (!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;
 }
 
+int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
+{
+	item->object.parsed = 1;
+	return 0;
+}
+
 int parse_blob(struct blob *item)
 {
         char type[20];
         void *buffer;
         unsigned long size;
+	int ret;
+
         if (item->object.parsed)
                 return 0;
-        item->object.parsed = 1;
         buffer = read_sha1_file(item->object.sha1, type, &size);
         if (!buffer)
                 return error("Could not read %s",
                              sha1_to_hex(item->object.sha1));
-	free(buffer);
         if (strcmp(type, blob_type))
                 return error("Object %s not a blob",
                              sha1_to_hex(item->object.sha1));
-	return 0;
+	ret = parse_blob_buffer(item, buffer, size);
+	free(buffer);
+	return ret;
 }