From e50b84c96f29b8a7858f0aa12128abf67963a3d0 Mon Sep 17 00:00:00 2001
From: robs <robs>
Date: Mon, 3 Feb 2003 23:07:37 +0000
Subject: [PATCH] cleanup some warnings in the release build as a result of the
 last commit regarding asserts

---
 fcgi.h        |  4 +---
 fcgi_buf.c    | 10 +++++++---
 mod_fastcgi.c | 10 ++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/fcgi.h b/fcgi.h
index 02fc09c..1cce9e5 100644
--- a/fcgi.h
+++ b/fcgi.h
@@ -1,5 +1,5 @@
 /*
- * $Id: fcgi.h,v 1.43 2003/02/03 22:59:01 robs Exp $
+ * $Id: fcgi.h,v 1.44 2003/02/03 23:07:37 robs Exp $
  */
 
 #ifndef FCGI_H
@@ -471,10 +471,8 @@ int fcgi_protocol_dequeue(pool *p, fcgi_request *fr);
 #define BufferLength(b)     ((b)->length)
 #define BufferFree(b)       ((b)->size - (b)->length)
 
-void fcgi_buf_check(Buffer *bufPtr);
 void fcgi_buf_reset(Buffer *bufPtr);
 Buffer *fcgi_buf_new(pool *p, int size);
-void BufferDelete(Buffer *bufPtr);
 
 #ifndef WIN32
 typedef int SOCKET;
diff --git a/fcgi_buf.c b/fcgi_buf.c
index 0c63b10..545e67b 100644
--- a/fcgi_buf.c
+++ b/fcgi_buf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fcgi_buf.c,v 1.17 2003/02/03 22:59:01 robs Exp $
+ * $Id: fcgi_buf.c,v 1.18 2003/02/03 23:07:37 robs Exp $
  */
 
 #include "fcgi.h"
@@ -15,7 +15,8 @@
 /*******************************************************************************
  * Check buffer consistency with assertions.
  */
-void fcgi_buf_check(Buffer *buf)
+#ifdef DEBUG
+static void fcgi_buf_check(Buffer *buf)
 {
     ASSERT(buf->size > 0);
     ASSERT(buf->length >= 0);
@@ -29,7 +30,10 @@ void fcgi_buf_check(Buffer *buf)
     ASSERT(((buf->end - buf->begin + buf->size) % buf->size)
             == (buf->length % buf->size));
 }
-
+#else
+#define fcgi_buf_check(a) ((void) 0)
+#endif
+ 
 /*******************************************************************************
  * Reset buffer, losing any data that's in it.
  */
diff --git a/mod_fastcgi.c b/mod_fastcgi.c
index 1a0e3a2..eb37523 100644
--- a/mod_fastcgi.c
+++ b/mod_fastcgi.c
@@ -3,7 +3,7 @@
  *
  *      Apache server module for FastCGI.
  *
- *  $Id: mod_fastcgi.c,v 1.149 2003/02/03 22:59:01 robs Exp $
+ *  $Id: mod_fastcgi.c,v 1.150 2003/02/03 23:07:37 robs Exp $
  *
  *  Copyright (c) 1995-1996 Open Market, Inc.
  *
@@ -813,16 +813,22 @@ static const char *process_headers(request_rec *r, fcgi_request *fr)
     }
 
     len = fr->header->nelts - (next - fr->header->elts);
+
     ASSERT(len >= 0);
     ASSERT(BufferLength(fr->clientOutputBuffer) == 0);
+    
     if (BufferFree(fr->clientOutputBuffer) < len) {
         fr->clientOutputBuffer = fcgi_buf_new(r->pool, len);
     }
+    
     ASSERT(BufferFree(fr->clientOutputBuffer) >= len);
+
     if (len > 0) {
-        int sent = fcgi_buf_add_block(fr->clientOutputBuffer, next, len);
+        int sent;
+        sent = fcgi_buf_add_block(fr->clientOutputBuffer, next, len);
         ASSERT(sent == len);
     }
+
     return NULL;
 
 BadHeader:
-- 
2.11.4.GIT