development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cat-file: refactor error handling of batch_objects

Browse source 
This just pulls the return value for the function out of the
inner loop, so we can break out of the loop rather than do
an early return. This will make it easier to put any cleanup
for the function in one place.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-01-07 17:10:15 -05:00 committed by Junio C Hamano
parent 832cf74c07
commit 07e2383945
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
builtin/cat-file.c
View file

@ -260,6 +260,7 @@ static int batch_objects(struct batch_options *opt)
{
struct strbuf buf = STRBUF_INIT;
struct expand_data data;
int retval = 0;
if (!opt->format)
opt->format = "%(objectname) %(objecttype) %(objectsize)";
@ -284,8 +285,6 @@ static int batch_objects(struct batch_options *opt)
warn_on_object_refname_ambiguity = 0;
while (strbuf_getline(&buf, stdin, '\n') != EOF) {
int error;
if (data.split_on_whitespace) {
/*
* Split at first whitespace, tying off the beginning
@ -300,12 +299,12 @@ static int batch_objects(struct batch_options *opt)
data.rest = p;
}
error = batch_one_object(buf.buf, opt, &data);
if (error)
return error;
retval = batch_one_object(buf.buf, opt, &data);
if (retval)
break;
}
return 0;
return retval;
}
static const char * const cat_file_usage[] = {