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>
		
			
				
	
	
		
			108 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			108 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "cache.h"
 | 
						|
#include "tag.h"
 | 
						|
 | 
						|
const char *tag_type = "tag";
 | 
						|
 | 
						|
struct object *deref_tag(struct object *o, const char *warn, int warnlen)
 | 
						|
{
 | 
						|
	while (o && o->type == OBJ_TAG)
 | 
						|
		o = parse_object(((struct tag *)o)->tagged->sha1);
 | 
						|
	if (!o && warn) {
 | 
						|
		if (!warnlen)
 | 
						|
			warnlen = strlen(warn);
 | 
						|
		error("missing object referenced by '%.*s'", warnlen, warn);
 | 
						|
	}
 | 
						|
	return o;
 | 
						|
}
 | 
						|
 | 
						|
struct tag *lookup_tag(const unsigned char *sha1)
 | 
						|
{
 | 
						|
        struct object *obj = lookup_object(sha1);
 | 
						|
        if (!obj) {
 | 
						|
                struct tag *ret = alloc_tag_node();
 | 
						|
                created_object(sha1, &ret->object);
 | 
						|
                ret->object.type = OBJ_TAG;
 | 
						|
                return ret;
 | 
						|
        }
 | 
						|
	if (!obj->type)
 | 
						|
		obj->type = OBJ_TAG;
 | 
						|
        if (obj->type != OBJ_TAG) {
 | 
						|
                error("Object %s is a %s, not a tree",
 | 
						|
                      sha1_to_hex(sha1), typename(obj->type));
 | 
						|
                return NULL;
 | 
						|
        }
 | 
						|
        return (struct tag *) obj;
 | 
						|
}
 | 
						|
 | 
						|
int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
 | 
						|
{
 | 
						|
	int typelen, taglen;
 | 
						|
	unsigned char object[20];
 | 
						|
	const char *type_line, *tag_line, *sig_line;
 | 
						|
	char type[20];
 | 
						|
 | 
						|
        if (item->object.parsed)
 | 
						|
                return 0;
 | 
						|
        item->object.parsed = 1;
 | 
						|
 | 
						|
	if (size < 64)
 | 
						|
		return -1;
 | 
						|
	if (memcmp("object ", data, 7) || get_sha1_hex((char *) data + 7, object))
 | 
						|
		return -1;
 | 
						|
 | 
						|
	type_line = (char *) data + 48;
 | 
						|
	if (memcmp("\ntype ", type_line-1, 6))
 | 
						|
		return -1;
 | 
						|
 | 
						|
	tag_line = strchr(type_line, '\n');
 | 
						|
	if (!tag_line || memcmp("tag ", ++tag_line, 4))
 | 
						|
		return -1;
 | 
						|
 | 
						|
	sig_line = strchr(tag_line, '\n');
 | 
						|
	if (!sig_line)
 | 
						|
		return -1;
 | 
						|
	sig_line++;
 | 
						|
 | 
						|
	typelen = tag_line - type_line - strlen("type \n");
 | 
						|
	if (typelen >= 20)
 | 
						|
		return -1;
 | 
						|
	memcpy(type, type_line + 5, typelen);
 | 
						|
	type[typelen] = '\0';
 | 
						|
	taglen = sig_line - tag_line - strlen("tag \n");
 | 
						|
	item->tag = xmalloc(taglen + 1);
 | 
						|
	memcpy(item->tag, tag_line + 4, taglen);
 | 
						|
	item->tag[taglen] = '\0';
 | 
						|
 | 
						|
	item->tagged = lookup_object_type(object, type);
 | 
						|
	if (item->tagged && track_object_refs) {
 | 
						|
		struct object_refs *refs = alloc_object_refs(1);
 | 
						|
		refs->ref[0] = item->tagged;
 | 
						|
		set_object_refs(&item->object, refs);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
int parse_tag(struct tag *item)
 | 
						|
{
 | 
						|
	char type[20];
 | 
						|
	void *data;
 | 
						|
	unsigned long size;
 | 
						|
	int ret;
 | 
						|
 | 
						|
	if (item->object.parsed)
 | 
						|
		return 0;
 | 
						|
	data = read_sha1_file(item->object.sha1, type, &size);
 | 
						|
	if (!data)
 | 
						|
		return error("Could not read %s",
 | 
						|
			     sha1_to_hex(item->object.sha1));
 | 
						|
	if (strcmp(type, tag_type)) {
 | 
						|
		free(data);
 | 
						|
		return error("Object %s not a tag",
 | 
						|
			     sha1_to_hex(item->object.sha1));
 | 
						|
	}
 | 
						|
	ret = parse_tag_buffer(item, data, size);
 | 
						|
	free(data);
 | 
						|
	return ret;
 | 
						|
}
 |