httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1766129 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_stream.c
Date Fri, 21 Oct 2016 21:05:39 GMT
Author: ylavic
Date: Fri Oct 21 21:05:39 2016
New Revision: 1766129

URL: http://svn.apache.org/viewvc?rev=1766129&view=rev
Log:
Fix -Wunused-but-set-variable warnings.

Modified:
    httpd/httpd/trunk/modules/http2/h2_session.c
    httpd/httpd/trunk/modules/http2/h2_stream.c

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1766129&r1=1766128&r2=1766129&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Fri Oct 21 21:05:39 2016
@@ -1431,7 +1431,6 @@ static apr_status_t on_stream_headers(h2
     }
     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)

Modified: httpd/httpd/trunk/modules/http2/h2_stream.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_stream.c?rev=1766129&r1=1766128&r2=1766129&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_stream.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_stream.c Fri Oct 21 21:05:39 2016
@@ -449,7 +449,7 @@ int h2_stream_is_scheduled(const h2_stre
 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_st
     }
     
     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,



Mime
View raw message