Remove some debugging code and clean up some gcc warnings in cgi-fcgi.c.

Modified Files: README cgi-fcgi/cgi-fcgi.c

diff --git a/README b/README
index cacc9cd..2a2d29c 100755 (executable)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ FastCGI Developer's Kit README
 ------------------------------
 
     Version 2.0b2, 04 April 1997
-    $Id: README,v 1.5 1999/07/26 04:28:07 roberts Exp $
+    $Id: README,v 1.6 1999/07/26 04:45:52 roberts Exp $
     Copyright (c) 1996 Open Market, Inc.
     See the file "LICENSE.TERMS" for information on usage and redistribution
     of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -38,6 +38,8 @@ release of the FDK.
 Changes with devkit 2.1.1
 -------------------------
 
+ *) Remove some debugging code and clean up some gcc warnings in cgi-fcgi.c.
+
  *) Add multithread support to the fcgiapp lib and an example multithreaded
     application, threaded.c.  Based on work by Dennis Payne 
     <dpayne@softscape.com> and Gene Sokolov <hook@aktrad.ru>.

diff --git a/cgi-fcgi/cgi-fcgi.c b/cgi-fcgi/cgi-fcgi.c
index 292a3d6..bd827c1 100644 (file)
--- a/cgi-fcgi/cgi-fcgi.c
+++ b/cgi-fcgi/cgi-fcgi.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: cgi-fcgi.c,v 1.2 1999/01/30 22:33:23 roberts Exp $";
+static const char rcsid[] = "$Id: cgi-fcgi.c,v 1.3 1999/07/26 04:45:52 roberts Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -512,8 +512,6 @@ static void FCGI_Start(char *bindPath, char *appPath, int nServers)
  *
  *----------------------------------------------------------------------
  */
-static buildNameValueHeaderCalls = 0; /* XXX: for testing */
-
 static void FCGIUtil_BuildNameValueHeader(
         int nameLen,
         int valueLen,
@@ -522,7 +520,7 @@ static void FCGIUtil_BuildNameValueHeader(
     unsigned char *startHeaderBuffPtr = headerBuffPtr;
 
     ASSERT(nameLen >= 0);
-    if(nameLen < 0x80 && (buildNameValueHeaderCalls & 1) == 0) {
+    if (nameLen < 0x80 == 0) {
         *headerBuffPtr++ = nameLen;
     } else {
         *headerBuffPtr++ = (nameLen >> 24) | 0x80;
@@ -531,7 +529,7 @@ static void FCGIUtil_BuildNameValueHeader(
         *headerBuffPtr++ = nameLen;
     }
     ASSERT(valueLen >= 0);
-    if(valueLen < 0x80 && (buildNameValueHeaderCalls & 2) == 0) {
+    if (valueLen < 0x80 == 0) {
         *headerBuffPtr++ = valueLen;
     } else {
         *headerBuffPtr++ = (valueLen >> 24) | 0x80;
@@ -540,7 +538,6 @@ static void FCGIUtil_BuildNameValueHeader(
         *headerBuffPtr++ = valueLen;
     }
     *headerLenPtr = headerBuffPtr - startHeaderBuffPtr;
-    buildNameValueHeaderCalls++;
 }
 \f
 
@@ -682,7 +679,7 @@ static int ParseArgs(int argc, char *argv[],
     return err;
 }
 \f
-void main(int argc, char **argv, char **envp)
+int main(int argc, char **argv, char **envp)
 {
     int count;
     FCGX_Stream *paramsStream;
@@ -804,4 +801,6 @@ void main(int argc, char **argv, char **envp)
     } else {
         FCGIexit(999);
     }
+
+    exit(0);
 }