[PATCH v2 1/5] cat-file: refactor error handling of batch_objects
- From
Jeff King <peff@peff.net>
- Date
- Jan 7, 2014, 23:57 UTC
- Message-ID
- <20140107235719.GA10657@sigill.intra.peff.net>
- In-Reply-To
- <20140107235631.GA10503@sigill.intra.peff.net>
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> --- builtin/cat-file.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index f8288c8..971cdde 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -263,6 +263,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)"; @@ -294,8 +295,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 @@ -310,12 +309,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[] = {
-- 1.8.5.2.500.g8060133