mirror of
https://github.com/git/git.git
synced 2024-11-28 20:44:04 +08:00
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>
This commit is contained in:
parent
fdf96a20ac
commit
331004836b
@ -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) ||
|
||||
|
Loading…
Reference in New Issue
Block a user