From a749985436f5a46b67356bc830685dad4a69a262 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Fri, 19 Jun 2015 12:32:54 +0000 Subject: [PATCH] Merge r1684057 from trunk: mpm_event: Follow up to r1664071: quiet compiler (spurious) warning. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686399 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ server/mpm/event/event.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/STATUS b/STATUS index b892058d0a..543351de9b 100644 --- a/STATUS +++ b/STATUS @@ -107,12 +107,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) event: quiet compiler warning (spurious, "'last' may be used - uninitialized", though actually it won't). - trunk patch: http://svn.apache.org/r1684057 - 2.4.x patch: trunk works (modulo CHANGES) - +1: ylavic, jailletc36, ocovener - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 825686cb80..9d68dd9b3d 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -1447,7 +1447,7 @@ static void process_timeout_queue(struct timeout_queue *q, APR_RING_INIT(&trash, event_conn_state_t, timeout_list); for (qp = q; qp; qp = qp->next) { count = 0; - cs = first = APR_RING_FIRST(&qp->head); + cs = first = last = APR_RING_FIRST(&qp->head); while (cs != APR_RING_SENTINEL(&qp->head, event_conn_state_t, timeout_list) /* Trash the entry if: -- 2.50.1