mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup unpack_entry_gently and friends to use type_name array.

Browse Source 
[PATCH 3/5] Cleanup unpack_entry_gently and friends to use type_name array.

This change allows combining all of the non-delta entries into a
single case, as well as to remove an unnecessary local variable
in unpack_entry_gently.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn Pearce
2006-08-26 04:11:36 -04:00
committed by Junio C Hamano
parent 7c3e8be307
commit 5a18f540a5
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sha1_file.c
View File

@ -996,16 +996,10 @@ void packed_object_info_detail(struct pack_entry *e,
} }
switch (kind) { switch (kind) {
case OBJ_COMMIT: case OBJ_COMMIT:
strcpy(type, commit_type);
break;
case OBJ_TREE: case OBJ_TREE:
strcpy(type, tree_type);
break;
case OBJ_BLOB: case OBJ_BLOB:
strcpy(type, blob_type);
break;
case OBJ_TAG: case OBJ_TAG:
strcpy(type, tag_type); strcpy(type, type_names[kind]);
break; break;
default: default:
die("corrupted pack file %s containing object of kind %d", die("corrupted pack file %s containing object of kind %d",
@ -1036,16 +1030,10 @@ static int packed_object_info(struct pack_entry *entry,
unuse_packed_git(p); unuse_packed_git(p);
return retval; return retval;
case OBJ_COMMIT: case OBJ_COMMIT:
strcpy(type, commit_type);
break;
case OBJ_TREE: case OBJ_TREE:
strcpy(type, tree_type);
break;
case OBJ_BLOB: case OBJ_BLOB:
strcpy(type, blob_type);
break;
case OBJ_TAG: case OBJ_TAG:
strcpy(type, tag_type); strcpy(type, type_names[kind]);
break; break;
default: default:
die("corrupted pack file %s containing object of kind %d", die("corrupted pack file %s containing object of kind %d",
@ -1143,33 +1131,23 @@ void *unpack_entry_gently(struct pack_entry *entry,
unsigned long offset, size, left; unsigned long offset, size, left;
unsigned char *pack; unsigned char *pack;
enum object_type kind; enum object_type kind;
void *retval;
offset = unpack_object_header(p, entry->offset, &kind, &size); offset = unpack_object_header(p, entry->offset, &kind, &size);
pack = (unsigned char *) p->pack_base + offset; pack = (unsigned char *) p->pack_base + offset;
left = p->pack_size - offset; left = p->pack_size - offset;
switch (kind) { switch (kind) {
case OBJ_DELTA: case OBJ_DELTA:
retval = unpack_delta_entry(pack, size, left, type, sizep, p); return unpack_delta_entry(pack, size, left, type, sizep, p);
return retval;
case OBJ_COMMIT: case OBJ_COMMIT:
strcpy(type, commit_type);
break;
case OBJ_TREE: case OBJ_TREE:
strcpy(type, tree_type);
break;
case OBJ_BLOB: case OBJ_BLOB:
strcpy(type, blob_type);
break;
case OBJ_TAG: case OBJ_TAG:
strcpy(type, tag_type); strcpy(type, type_names[kind]);
break; *sizep = size;
return unpack_compressed_entry(pack, size, left);
default: default:
return NULL; return NULL;
} }
*sizep = size;
retval = unpack_compressed_entry(pack, size, left);
return retval;
} }
int num_packed_objects(const struct packed_git *p) int num_packed_objects(const struct packed_git *p)