From 331004836b3b374ce379775782367e4adf6f204a Mon Sep 17 00:00:00 2001 From: Alexander Kuleshov Date: Sun, 11 Jan 2015 00:13:23 +0600 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin/cat-file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index f8d81291b9..5e24e811ee 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) || -- 2.11.4.GIT