From d80e4f701b653b9e215f3caa96d245ac1d022811 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 21 Oct 2016 21:05:39 +0000 Subject: [PATCH] Fix -Wunused-but-set-variable warnings. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1766129 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/h2_session.c | 1 - modules/http2/h2_stream.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index 3edc19a608..78bd7d72bd 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -1431,7 +1431,6 @@ static apr_status_t on_stream_headers(h2_session *session, h2_stream *stream, } else if (stream->has_response) { h2_ngheader *nh; - int rv; nh = h2_util_ngheader_make(stream->pool, headers->headers); ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03072) diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c index 41eeaa14bc..ab1c5ce3ab 100644 --- a/modules/http2/h2_stream.c +++ b/modules/http2/h2_stream.c @@ -449,7 +449,7 @@ int h2_stream_is_scheduled(const h2_stream *stream) apr_status_t h2_stream_close_input(h2_stream *stream) { conn_rec *c = stream->session->c; - apr_status_t status = APR_SUCCESS; + apr_status_t status = APR_SUCCESS, rv; ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, stream->session->c, "h2_stream(%ld-%d): closing input", @@ -477,7 +477,8 @@ apr_status_t h2_stream_close_input(h2_stream *stream) } close_input(stream); - return h2_beam_close(stream->input); + rv = h2_beam_close(stream->input); + return status ? status : rv; } apr_status_t h2_stream_write_data(h2_stream *stream, -- 2.40.0