Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/blob.c b/blob.c
index 496f270043a617242efa9d27285853feb2597484..bd7d078e1ae5fe4ce0a16fda62a2c1743237941b 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,21 +1,16 @@
 #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 = TYPE_BLOB;
-               return ret;
-       }
+       if (!obj)
+               return create_object(sha1, OBJ_BLOB, alloc_blob_node());
        if (!obj->type)
-               obj->type = TYPE_BLOB;
-       if (obj->type != TYPE_BLOB) {
+               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;
@@ -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);