mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: cache: rename all occurrences of stconn "cs" to "sc"

Browse Source 
Function arguments and local variables called "cs" were renamed to "sc"
to avoid future confusion.
This commit is contained in:
Willy Tarreau 2022-05-27 10:33:20 +02:00
parent 07ee044762
commit c5ddd9fd80
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cache.c
View File

@ -1455,9 +1455,9 @@ static void http_cache_io_handler(struct appctx *appctx)
struct cache_appctx *ctx = appctx->svcctx; struct cache_appctx *ctx = appctx->svcctx;
struct cache_entry *cache_ptr = ctx->entry; struct cache_entry *cache_ptr = ctx->entry;
struct shared_block *first = block_ptr(cache_ptr); struct shared_block *first = block_ptr(cache_ptr);
struct stconn *cs = appctx_cs(appctx); struct stconn *sc = appctx_cs(appctx);
struct channel *req = sc_oc(cs); struct channel *req = sc_oc(sc);
struct channel *res = sc_ic(cs); struct channel *res = sc_ic(sc);
struct htx *req_htx, *res_htx; struct htx *req_htx, *res_htx;
struct buffer *errmsg; struct buffer *errmsg;
unsigned int len; unsigned int len;
@ -1466,12 +1466,12 @@ static void http_cache_io_handler(struct appctx *appctx)
res_htx = htx_from_buf(&res->buf); res_htx = htx_from_buf(&res->buf);
total = res_htx->data; total = res_htx->data;
if (unlikely(cs->state == SC_ST_DIS || cs->state == SC_ST_CLO)) if (unlikely(sc->state == SC_ST_DIS || sc->state == SC_ST_CLO))
goto out; goto out;
/* Check if the input buffer is available. */ /* Check if the input buffer is available. */
if (!b_size(&res->buf)) { if (!b_size(&res->buf)) {
sc_need_room(cs); sc_need_room(sc);
goto out; goto out;
} }
@ -1505,7 +1505,7 @@ static void http_cache_io_handler(struct appctx *appctx)
/* Skip response body for HEAD requests or in case of "304 Not /* Skip response body for HEAD requests or in case of "304 Not
* Modified" response. */ * Modified" response. */
if (__sc_strm(cs)->txn->meth == HTTP_METH_HEAD || ctx->send_notmodified) if (__sc_strm(sc)->txn->meth == HTTP_METH_HEAD || ctx->send_notmodified)
appctx->st0 = HTX_CACHE_EOM; appctx->st0 = HTX_CACHE_EOM;
else else
appctx->st0 = HTX_CACHE_DATA; appctx->st0 = HTX_CACHE_DATA;
@ -1516,7 +1516,7 @@ static void http_cache_io_handler(struct appctx *appctx)
if (len) { if (len) {
ret = htx_cache_dump_msg(appctx, res_htx, len, HTX_BLK_UNUSED); ret = htx_cache_dump_msg(appctx, res_htx, len, HTX_BLK_UNUSED);
if (ret < len) { if (ret < len) {
sc_need_room(cs); sc_need_room(sc);
goto out; goto out;
} }
} }
@ -1534,7 +1534,7 @@ static void http_cache_io_handler(struct appctx *appctx)
end: end:
if (!(res->flags & CF_SHUTR) && appctx->st0 == HTX_CACHE_END) { if (!(res->flags & CF_SHUTR) && appctx->st0 == HTX_CACHE_END) {
res->flags |= CF_READ_NULL; res->flags |= CF_READ_NULL;
sc_shutr(cs); sc_shutr(sc);
} }
out: out: