index ea52ad5c9d819721ff6f631d7d5b3057fabcd633..d1af2e62f14965fab491a3d9dde712f02b718adc 100644 (file)
--- a/blob.c
+++ b/blob.c
-#include "blob.h"
#include "cache.h"
+#include "blob.h"
#include <stdlib.h>
const char *blob_type = "blob";
{
struct object *obj = lookup_object(sha1);
if (!obj) {
- struct blob *ret = xmalloc(sizeof(struct blob));
- memset(ret, 0, sizeof(struct blob));
+ struct blob *ret = alloc_blob_node();
created_object(sha1, &ret->object);
- ret->object.type = blob_type;
+ ret->object.type = OBJ_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 = 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;
}
return (struct blob *) obj;