mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-10 04:01:11 +01:00
Code Issues Projects Releases Wiki Activity

BUILD: fix compilation error with DEBUG_FULL

Browse Source 
Recent changes in structures broke the compilation when using DEBUG_FULL.
Let's update apply the changes also to the variables used in DPRINTF calls.
This commit is contained in:
Cyril Bonté 2012-09-23 14:19:12 +02:00 committed by Willy Tarreau
parent 086fbf53b5
commit 3aaba440a2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend.c
View File

@ -1144,7 +1144,7 @@ int tcp_persist_rdp_cookie(struct session *s, struct channel *req, int an_bit)
req, req,
req->rex, req->wex, req->rex, req->wex,
req->flags, req->flags,
req->i, req->buf.i,
req->analysers); req->analysers);
if (s->flags & SN_ASSIGNED) if (s->flags & SN_ASSIGNED)

2
src/dumpstats.c
View File

@ -1614,7 +1614,7 @@ static void cli_io_handler(struct stream_interface *si)
out: out:
DPRINTF(stderr, "%s@%d: st=%d, rqf=%x, rpf=%x, rqh=%d, rqs=%d, rh=%d, rs=%d\n", DPRINTF(stderr, "%s@%d: st=%d, rqf=%x, rpf=%x, rqh=%d, rqs=%d, rh=%d, rs=%d\n",
__FUNCTION__, __LINE__, __FUNCTION__, __LINE__,
si->state, req->flags, res->flags, req->i, req->o, res->i, res->o); si->state, req->flags, res->flags, req->buf.i, req->buf.o, res->buf.i, res->buf.o);
if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO)) { if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO)) {
/* check that we have released everything then unregister */ /* check that we have released everything then unregister */

4
src/proto_tcp.c
View File

@ -782,7 +782,7 @@ int tcp_inspect_request(struct session *s, struct channel *req, int an_bit)
req, req,
req->rex, req->wex, req->rex, req->wex,
req->flags, req->flags,
req->i, req->buf.i,
req->analysers); req->analysers);
/* We don't know whether we have enough data, so must proceed /* We don't know whether we have enough data, so must proceed
@ -901,7 +901,7 @@ int tcp_inspect_response(struct session *s, struct channel *rep, int an_bit)
rep, rep,
rep->rex, rep->wex, rep->rex, rep->wex,
rep->flags, rep->flags,
rep->i, rep->buf.i,
rep->analysers); rep->analysers);
/* We don't know whether we have enough data, so must proceed /* We don't know whether we have enough data, so must proceed

14
src/session.c
View File

@ -863,7 +863,7 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s
s->req, s->rep, s->req, s->rep,
s->req->rex, s->rep->wex, s->req->rex, s->rep->wex,
s->req->flags, s->rep->flags, s->req->flags, s->rep->flags,
s->req->i, s->req->o, s->rep->i, s->rep->o, s->rep->cons->state, s->req->cons->state); s->req->buf.i, s->req->buf.o, s->rep->buf.i, s->rep->buf.o, s->rep->cons->state, s->req->cons->state);
if (si->state == SI_ST_ASS) { if (si->state == SI_ST_ASS) {
/* Server assigned to connection request, we have to try to connect now */ /* Server assigned to connection request, we have to try to connect now */
@ -1051,7 +1051,7 @@ static void sess_prepare_conn_req(struct session *s, struct stream_interface *si
s->req, s->rep, s->req, s->rep,
s->req->rex, s->rep->wex, s->req->rex, s->rep->wex,
s->req->flags, s->rep->flags, s->req->flags, s->rep->flags,
s->req->i, s->req->o, s->rep->i, s->rep->o, s->rep->cons->state, s->req->cons->state); s->req->buf.i, s->req->buf.o, s->rep->buf.i, s->rep->buf.o, s->rep->cons->state, s->req->cons->state);
if (si->state != SI_ST_REQ) if (si->state != SI_ST_REQ)
return; return;
@ -1100,7 +1100,7 @@ static int process_switching_rules(struct session *s, struct channel *req, int a
req, req,
req->rex, req->wex, req->rex, req->wex,
req->flags, req->flags,
req->i, req->buf.i,
req->analysers); req->analysers);
/* now check whether we have some switching rules for this request */ /* now check whether we have some switching rules for this request */
@ -1195,7 +1195,7 @@ static int process_server_rules(struct session *s, struct channel *req, int an_b
req, req,
req->rex, req->wex, req->rex, req->wex,
req->flags, req->flags,
req->i + req->o, req->buf.i + req->buf.o,
req->analysers); req->analysers);
if (!(s->flags & SN_ASSIGNED)) { if (!(s->flags & SN_ASSIGNED)) {
@ -1244,7 +1244,7 @@ static int process_sticking_rules(struct session *s, struct channel *req, int an
req, req,
req->rex, req->wex, req->rex, req->wex,
req->flags, req->flags,
req->i, req->buf.i,
req->analysers); req->analysers);
list_for_each_entry(rule, &px->sticking_rules, list) { list_for_each_entry(rule, &px->sticking_rules, list) {
@ -1334,7 +1334,7 @@ static int process_store_rules(struct session *s, struct channel *rep, int an_bi
rep, rep,
rep->rex, rep->wex, rep->rex, rep->wex,
rep->flags, rep->flags,
rep->i, rep->buf.i,
rep->analysers); rep->analysers);
list_for_each_entry(rule, &px->storersp_rules, list) { list_for_each_entry(rule, &px->storersp_rules, list) {
@ -1581,7 +1581,7 @@ struct task *process_session(struct task *t)
s->req, s->rep, s->req, s->rep,
s->req->rex, s->rep->wex, s->req->rex, s->rep->wex,
s->req->flags, s->rep->flags, s->req->flags, s->rep->flags,
s->req->i, s->req->o, s->rep->i, s->rep->o, s->rep->cons->state, s->req->cons->state, s->req->buf.i, s->req->buf.o, s->rep->buf.i, s->rep->buf.o, s->rep->cons->state, s->req->cons->state,
s->rep->cons->err_type, s->req->cons->err_type, s->rep->cons->err_type, s->req->cons->err_type,
s->req->cons->conn_retries); s->req->cons->conn_retries);