summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorAlexander Kuleshov <kuleshovmail@gmail.com>2015-01-10 18:13:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-13 20:36:04 (GMT)
commit331004836b3b374ce379775782367e4adf6f204a (patch)
tree14a6f4c4bd2dd7194e8b5e12040b3aaa97fad0c0 /builtin/cat-file.c
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-331004836b3b374ce379775782367e4adf6f204a.zip
git-331004836b3b374ce379775782367e4adf6f204a.tar.gz
git-331004836b3b374ce379775782367e4adf6f204a.tar.bz2
cat-file: use "type" and "size" from outer scope
In cat_one_file(), "type" and "size" variables are defined in the function scope, and then two variables of the same name are defined in a block in one of the if/else statement, hiding the definitions in the outer scope. Because the values of the outer variables before the control enters this scope, however, do not have to be preserved, we can remove useless definitions of variables from the inner scope safely without breaking anything. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/cat-file.c')
-rw-r--r--builtin/cat-file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f8d8129..5e24e81 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -79,8 +79,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
if (type_from_string(exp_type) == OBJ_BLOB) {
unsigned char blob_sha1[20];
if (sha1_object_info(sha1, NULL) == OBJ_TAG) {
- enum object_type type;
- unsigned long size;
char *buffer = read_sha1_file(sha1, &type, &size);
const char *target;
if (!skip_prefix(buffer, "object ", &target) ||