1974632c66
This updates the type-enumeration constants introduced to reduce the memory footprint of "struct object" to match the type bits already used in the packfile format, by removing the former (i.e. TYPE_* constant macros) and using the latter (i.e. enum object_type) throughout the code for consistency. Eventually we can stop passing around the "type strings" entirely, and this will help - no confusion about two different integer enumeration. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
52 lines
1.2 KiB
C
52 lines
1.2 KiB
C
#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->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;
|
|
}
|
|
|
|
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;
|
|
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))
|
|
return error("Object %s not a blob",
|
|
sha1_to_hex(item->object.sha1));
|
|
ret = parse_blob_buffer(item, buffer, size);
|
|
free(buffer);
|
|
return ret;
|
|
}
|