From: CJ Ess <zxcvbn4038@gmail.com>
Date: Sat, 2 May 2015 20:35:24 +0000 (-0400)
Subject: BUILD: Compile clean when debug options defined
X-Git-Tag: v1.6-dev2~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6eac32ebc1ed7e25a8bf569b29da64b49847acc9;p=thirdparty%2Fhaproxy.git

BUILD: Compile clean when debug options defined

Here you go!
---

diff --git a/src/auth.c b/src/auth.c
index 42c08083e3..8b7d268a52 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -218,11 +218,14 @@ check_user(struct userlist *ul, const char *user, const char *pass)
 {
 
 	struct auth_users *u;
+#ifdef DEBUG_AUTH
+	struct auth_groups_list *agl;
+#endif
 	const char *ep;
 
 #ifdef DEBUG_AUTH
-	fprintf(stderr, "req: userlist=%s, user=%s, pass=%s, group=%s\n",
-		ul->name, user, pass, group);
+	fprintf(stderr, "req: userlist=%s, user=%s, pass=%s\n",
+	        ul->name, user, pass);
 #endif
 
 	for (u = ul->users; u; u = u->next)
diff --git a/src/stream.c b/src/stream.c
index 263a45f18f..5b5494bfab 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -737,10 +737,10 @@ static void sess_update_stream_int(struct stream *s)
 	DPRINTF(stderr,"[%u] %s: sess=%p rq=%p, rp=%p, exp(r,w)=%u,%u rqf=%08x rpf=%08x rqh=%d rqt=%d rph=%d rpt=%d cs=%d ss=%d\n",
 		now_ms, __FUNCTION__,
 		s,
-		req, s->rep,
+		req, &s->res,
 		req->rex, s->res.wex,
 		req->flags, s->res.flags,
-		req->buf->i, req->buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, req->cons->state);
+		req->buf->i, req->buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, s->si[1].state);
 
 	if (si->state == SI_ST_ASS) {
 		/* Server assigned to connection request, we have to try to connect now */
@@ -931,10 +931,10 @@ static void sess_prepare_conn_req(struct stream *s)
 	DPRINTF(stderr,"[%u] %s: sess=%p rq=%p, rp=%p, exp(r,w)=%u,%u rqf=%08x rpf=%08x rqh=%d rqt=%d rph=%d rpt=%d cs=%d ss=%d\n",
 		now_ms, __FUNCTION__,
 		s,
-		s->req, s->rep,
+		&s->req, &s->res,
 		s->req.rex, s->res.wex,
 		s->req.flags, s->res.flags,
-		s->req.buf->i, s->req.buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, s->req.cons->state);
+		s->req.buf->i, s->req.buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, s->si[1].state);
 
 	if (si->state != SI_ST_REQ)
 		return;