Cleanup unpack_entry_gently and friends to use type_name array.

[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>

diff --git a/sha1_file.c b/sha1_file.c
index 3d7358fe727453b6912098940dd139919f2e73c5..461768c317289531e81c44d496daea7fcfdb2f5c 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -996,16 +996,10 @@ void packed_object_info_detail(struct pack_entry *e,
        }
        switch (kind) {
        case OBJ_COMMIT:
        }
        switch (kind) {
        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;
        default:
                die("corrupted pack file %s containing object of kind %d",
                break;
        default:
                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);
                return retval;
        case OBJ_COMMIT:
                unuse_packed_git(p);
                return retval;
        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;
        default:
                die("corrupted pack file %s containing object of kind %d",
                break;
        default:
                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 char *pack;
        enum object_type kind;
        unsigned long offset, size, left;
        unsigned char *pack;
        enum object_type kind;

-       void *retval;

 
        offset = unpack_object_header(p, entry->offset, &kind, &size);
        pack = (unsigned char *) p->pack_base + offset;
        left = p->pack_size - offset;
        switch (kind) {
        case OBJ_DELTA:
 
        offset = unpack_object_header(p, entry->offset, &kind, &size);
        pack = (unsigned char *) p->pack_base + offset;
        left = p->pack_size - offset;
        switch (kind) {
        case OBJ_DELTA:

-               retval = unpack_delta_entry(pack, size, left, type, sizep, p);
-               return retval;
+               return unpack_delta_entry(pack, size, left, type, sizep, p);

        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);
-               break;
+               strcpy(type, type_names[kind]);
+               *sizep = size;
+               return unpack_compressed_entry(pack, size, left);

        default:
                return NULL;
        }
        default:
                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)