From: Vincenzo Farruggia <h1ddenm4n@gmail.com>
Date: Fri, 30 Jan 2009 16:49:10 +0000 (+0000)
Subject: [BUILD] Haproxy won't compile if DEBUG_FULL is defined
X-Git-Tag: v1.3.16-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b97cff1c2877469617024b018bd76d52d68aba7;p=thirdparty%2Fhaproxy.git

[BUILD] Haproxy won't compile if DEBUG_FULL is defined

As subject when i try to compile haproxy with -DDEBUG_FULL it stop at
stream_sock.c file with:
gcc -Iinclude -Wall -O2 -g     -DDEBUG_FULL  -DTPROXY -DENABLE_POLL
-DENABLE_EPOLL -DENABLE_SEPOLL -DNETFILTER -DUSE_GETSOCKNAME
-DCONFIG_HAPROXY_VERSION=\"1.3.15\"
-DCONFIG_HAPROXY_DATE=\"2008/04/19\" -c -o src/stream_sock.o
src/stream_sock.c
src/stream_sock.c: In function 'stream_sock_chk_rcv':
src/stream_sock.c:905: error: 'fd' undeclared (first use in this function)
src/stream_sock.c:905: error: (Each undeclared identifier is reported only once
src/stream_sock.c:905: error: for each function it appears in.)
src/stream_sock.c:905: error: 'ob' undeclared (first use in this function)
src/stream_sock.c: In function 'stream_sock_chk_snd':
src/stream_sock.c:940: error: 'fd' undeclared (first use in this function)
src/stream_sock.c:940: error: 'ib' undeclared (first use in this function)
make: *** [src/stream_sock.o] Error 1

With this patch all build fine:
---

diff --git a/src/stream_sock.c b/src/stream_sock.c
index ae4eb9880e..65a1e379c7 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -904,11 +904,11 @@ void stream_sock_chk_rcv(struct stream_interface *si)
 
 	DPRINTF(stderr,"[%u] %s: fd=%d owner=%p ib=%p, ob=%p, exp(r,w)=%u,%u ibf=%08x obf=%08x ibl=%d obl=%d si=%d\n",
 		now_ms, __FUNCTION__,
-		fd, fdtab[fd].owner,
-		ib, ob,
-		ib->rex, ob->wex,
-		ib->flags, ob->flags,
-		ib->l, ob->l, si->state);
+		si->fd, fdtab[si->fd].owner,
+		ib, si->ob,
+		ib->rex, si->ob->wex,
+		ib->flags, si->ob->flags,
+		ib->l, si->ob->l, si->state);
 
 	if (unlikely(si->state != SI_ST_EST || (ib->flags & BF_SHUTR)))
 		return;
@@ -939,11 +939,11 @@ void stream_sock_chk_snd(struct stream_interface *si)
 
 	DPRINTF(stderr,"[%u] %s: fd=%d owner=%p ib=%p, ob=%p, exp(r,w)=%u,%u ibf=%08x obf=%08x ibl=%d obl=%d si=%d\n",
 		now_ms, __FUNCTION__,
-		fd, fdtab[fd].owner,
-		ib, ob,
-		ib->rex, ob->wex,
-		ib->flags, ob->flags,
-		ib->l, ob->l, si->state);
+		si->fd, fdtab[si->fd].owner,
+		si->ib, ob,
+		si->ib->rex, ob->wex,
+		si->ib->flags, ob->flags,
+		si->ib->l, ob->l, si->state);
 
 	if (unlikely(si->state != SI_ST_EST || (ob->flags & BF_SHUTW)))
 		return;