From: David Barr Date: Thu, 31 May 2012 14:41:26 GMT Subject: [PATCH v2 2/6] vcs-svn: simplify cleanup in apply_one_window() Message-ID: <1338475290-22644-3-git-send-email-davidbarr@google.com> In-Reply-To: <1338475290-22644-1-git-send-email-davidbarr@google.com> As a side-effect, fix clang-analyzer warning: vcs-svn/svndiff.c:278:3: warning: expression result unused [-Wunused-value] error("invalid delta: incorrect postimage length"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This warning caused by an insanely concise error() upstream. Signed-off-by: David Barr --- vcs-svn/svndiff.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c index 57d647d..11a0e38 100644 --- a/vcs-svn/svndiff.c +++ b/vcs-svn/svndiff.c @@ -258,6 +258,7 @@ static int apply_window_in_core(struct window *ctx) static int apply_one_window(struct line_buffer *delta, off_t *delta_len, struct sliding_view *preimage, FILE *out) { + int rv = -1; struct window ctx = WINDOW_INIT(preimage); size_t out_len; size_t instructions_len; @@ -275,16 +276,15 @@ static int apply_one_window(struct line_buffer *delta, off_t *delta_len, if (apply_window_in_core(&ctx)) goto error_out; if (ctx.out.len != out_len) { - error("invalid delta: incorrect postimage length"); + rv = error("invalid delta: incorrect postimage length"); goto error_out; } if (write_strbuf(&ctx.out, out)) goto error_out; - window_release(&ctx); - return 0; + rv = 0; error_out: window_release(&ctx); - return -1; + return rv; } int svndiff0_apply(struct line_buffer *delta, off_t delta_len, -- 1.7.10.2