From 78abe3b1ed2ebdfaeef01e2d80b7659542b06f96 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Tue, 13 Dec 2016 17:45:48 +0300 Subject: [PATCH] odissey: set proper name for server_pool_next/route_pool_next --- core/od_be.c | 2 +- core/od_route_pool.c | 4 ++-- core/od_route_pool.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/od_be.c b/core/od_be.c index e3681542..c062dddb 100644 --- a/core/od_be.c +++ b/core/od_be.c @@ -186,7 +186,7 @@ od_bepop_pool(od_pooler_t *pooler, od_route_t *route) { for (;;) { od_server_t *server = - od_serverpool_pop(&route->server_pool, OD_SIDLE); + od_serverpool_next(&route->server_pool, OD_SIDLE); if (! server) break; /* ensure that connection is still viable */ diff --git a/core/od_route_pool.c b/core/od_route_pool.c index ccd88c7d..4c11a48f 100644 --- a/core/od_route_pool.c +++ b/core/od_route_pool.c @@ -86,14 +86,14 @@ od_routepool_match(od_routepool_t *pool, od_routeid_t *key) } od_server_t* -od_routepool_pop(od_routepool_t *pool, od_serverstate_t state) +od_routepool_next(od_routepool_t *pool, od_serverstate_t state) { od_route_t *route; od_list_t *i, *n; od_listforeach_safe(&pool->list, i, n) { route = od_container_of(i, od_route_t, link); od_server_t *server = - od_serverpool_pop(&route->server_pool, state); + od_serverpool_next(&route->server_pool, state); if (server) return server; } diff --git a/core/od_route_pool.h b/core/od_route_pool.h index 79d1eba2..380c7818 100644 --- a/core/od_route_pool.h +++ b/core/od_route_pool.h @@ -27,7 +27,7 @@ od_route_t* od_routepool_match(od_routepool_t*, od_routeid_t*); od_server_t* -od_routepool_pop(od_routepool_t*, od_serverstate_t); +od_routepool_next(od_routepool_t*, od_serverstate_t); od_server_t* od_routepool_foreach(od_routepool_t*, od_serverstate_t,