From: David Barr Date: Sat, 19 Mar 2011 07:20:53 GMT Subject: [PATCH 15/16] vcs-svn: microcleanup in svndiff0 window-reading code Message-ID: <1300519254-20201-16-git-send-email-david.barr@cordelta.com> In-Reply-To: <1300519254-20201-1-git-send-email-david.barr@cordelta.com> From: Jonathan Nieder Combine some ifs. No functional change intended. Missed this in "vcs-svn: let deltas use data from preimage" (2010-10-13). Signed-off-by: Jonathan Nieder Signed-off-by: David Barr --- vcs-svn/svndiff.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c index b7d40c8..ea727ee 100644 --- a/vcs-svn/svndiff.c +++ b/vcs-svn/svndiff.c @@ -267,11 +267,9 @@ static int apply_one_window(struct line_buffer *delta, off_t *delta_len, /* "source view" offset and length already handled; */ if (read_length(delta, &out_len, delta_len) || read_length(delta, &instructions_len, delta_len) || - read_length(delta, &data_len, delta_len)) - goto error_out; - if (read_chunk(delta, delta_len, &ctx.instructions, instructions_len)) - goto error_out; - if (read_chunk(delta, delta_len, &ctx.data, data_len)) + read_length(delta, &data_len, delta_len) || + read_chunk(delta, delta_len, &ctx.instructions, instructions_len) || + read_chunk(delta, delta_len, &ctx.data, data_len)) goto error_out; strbuf_grow(&ctx.out, out_len); if (apply_window_in_core(&ctx)) -- 1.7.3.2.846.gf4b062