From 5ea4fa839dd6736331b8050958025036d27c4dfb Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Wed, 10 Oct 2018 12:02:34 +0000 Subject: [PATCH] Eliminating some advanced conversion and shadow declaration compiler warnings. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1843430 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/h2_mplx.c | 2 +- modules/http2/h2_ngn_shed.c | 2 +- modules/http2/h2_proxy_session.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index 0fae117b4f..15ca108cd5 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -983,7 +983,7 @@ static apr_status_t unschedule_slow_tasks(h2_mplx *m) } if ((m->tasks_active - h2_ihash_count(m->sredo)) > m->limit_active) { - h2_stream *stream = get_timed_out_busy_stream(m); + stream = get_timed_out_busy_stream(m); if (stream) { /* Too many busy workers, unable to cancel enough streams * and with a busy, timed out stream, we tell the client diff --git a/modules/http2/h2_ngn_shed.c b/modules/http2/h2_ngn_shed.c index a9a234437f..8b532711d7 100644 --- a/modules/http2/h2_ngn_shed.c +++ b/modules/http2/h2_ngn_shed.c @@ -311,7 +311,7 @@ apr_status_t h2_ngn_shed_pull_request(h2_ngn_shed *shed, } if (1) { - h2_ngn_entry *entry = H2_REQ_ENTRIES_FIRST(&ngn->entries); + entry = H2_REQ_ENTRIES_FIRST(&ngn->entries); ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(03399) "h2_ngn_shed(%ld): pull task, nothing, first task %s", shed->c->id, entry->task->id); diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c index 996bc659e9..e6e0efeddf 100644 --- a/modules/http2/h2_proxy_session.c +++ b/modules/http2/h2_proxy_session.c @@ -1423,7 +1423,7 @@ run_loop: ap_log_cerror(APLOG_MARK, APLOG_TRACE3, status, session->c, APLOGNO(03365) "h2_proxy_session(%s): WAIT read, timeout=%fms", - session->id, (float)session->wait_timeout/1000.0); + session->id, session->wait_timeout/1000.0); if (status == APR_SUCCESS) { have_read = 1; dispatch_event(session, H2_PROXYS_EV_DATA_READ, 0, NULL); -- 2.40.0