compiler fixes from Ed Knowles

diff --git a/configure b/configure
index ac441a437e3a78a4482581e55e296afa1a9e32fa..d500f7853273bd62a937e444a93b3a4c6a238368 100755 (executable)
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.29 
+# From configure.in Revision: 1.30 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -2140,6 +2140,8 @@ case "$host" in
                LIBS=`echo $LIBS | sed -e s/-lsocket//`
                echo "Removing -lnsl for IRIX..."
                LIBS=`echo $LIBS | sed -e s/-lnsl//`
+               echo "Removing -lbsd for IRIX..."
+               LIBS=`echo $LIBS | sed -e s/-lbsd//`
                ;;
        *m88k*)
                CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
@@ -2190,7 +2192,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2194 "configure"
+#line 2196 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2240,7 +2242,7 @@ if test "$cross_compiling" = yes; then
   SQUID_FD_SETSIZE=256
 else
 cat > conftest.$ac_ext <<EOF
-#line 2244 "configure"
+#line 2246 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -2310,7 +2312,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2314 "configure"
+#line 2316 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2346,7 +2348,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2350 "configure"
+#line 2352 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2382,7 +2384,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2386 "configure"
+#line 2388 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2418,7 +2420,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2422 "configure"
+#line 2424 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2451,7 +2453,7 @@ EOF
 
 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2455 "configure"
+#line 2457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() { return 0; }
@@ -2475,7 +2477,7 @@ rm -f conftest*
 
 echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2479 "configure"
+#line 2481 "configure"
 #include "confdefs.h"
 extern int _dns_ttl_;
 int main() { return 0; }

diff --git a/configure.in b/configure.in
index 3d862732904b4b0eee8ce0d5391dad1f902c3ca3..9e284b53b5c17c2b2e6dde99bc977eed01e3b163 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.30 1996/08/30 23:25:59 wessels Exp $
+dnl  $Id: configure.in,v 1.31 1996/08/31 06:41:53 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.30 $)dnl
+AC_REVISION($Revision: 1.31 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -253,6 +253,8 @@ case "$host" in
                LIBS=`echo $LIBS | sed -e s/-lsocket//`
                echo "Removing -lnsl for IRIX..."
                LIBS=`echo $LIBS | sed -e s/-lnsl//`
+               echo "Removing -lbsd for IRIX..."
+               LIBS=`echo $LIBS | sed -e s/-lbsd//`
                ;;
        *m88k*)
                CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"

diff --git a/lib/base64.c b/lib/base64.c
index 7ac882bfd7836d4865be48c9610ab147429f2dec..6eb46f96853195bf365523fddf696aa16e189bc5 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -26,7 +26,7 @@ static void base64_init()
 }
 
 char *base64_decode(p)
-     unsigned char *p;
+     char *p;
 {
     static char result[8192];
     int c;

diff --git a/src/dnsserver.cc b/src/dnsserver.cc
index f0323ec884f37d6904b82b9e48a20836e30ee5e8..9acaf0bec88c6477302f9220d1321dcd1a5fb7a2 100644 (file)
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dnsserver.cc,v 1.17 1996/08/28 20:12:53 wessels Exp $
+ * $Id: dnsserver.cc,v 1.18 1996/08/31 06:40:18 wessels Exp $
  *
  * DEBUG: section 0     DNS Resolver
  * AUTHOR: Harvest Derived
@@ -452,7 +452,5 @@ int main(argc, argv)
            continue;
        }
     }
-    exit(0);
-    /*NOTREACHED */
-    return 0;
+    /* NOTREACHED */
 }

diff --git a/src/ident.cc b/src/ident.cc
index 14ccaa1e0359abc44dbfb5e829fa1fa6da42c24a..28ec383eebf8c47bb016c896fa04a5d0a7e75da8 100644 (file)
--- a/src/ident.cc
+++ b/src/ident.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ident.cc,v 1.9 1996/08/19 22:46:00 wessels Exp $
+ * $Id: ident.cc,v 1.10 1996/08/31 06:40:19 wessels Exp $
  *
  * DEBUG: section 30    Ident (RFC 931)
  * AUTHOR: Duane Wessels
@@ -78,7 +78,7 @@ void identStart(sock, icpState)
     sprintf(reqbuf, "%d, %d\r\n",
        ntohs(icpState->peer.sin_port),
        ntohs(icpState->me.sin_port));
-    (void) comm_write(sock,
+    comm_write(sock,
        reqbuf,
        strlen(reqbuf),
        5,                      /* timeout */

diff --git a/src/ssl.cc b/src/ssl.cc
index 86a451abbdd74f781eebeeea06122e572aac1da9..9d964d366c4e23757e79217c974f96401022faa5 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.12 1996/08/26 19:57:11 wessels Exp $
+ * $Id: ssl.cc,v 1.13 1996/08/31 06:40:20 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -427,9 +427,9 @@ static int sslConnect(fd, hp, sslState)
                (void *) sslState);
            return COMM_OK;
        }
-       if (opt_no_ipcache)
-           ipcacheInvalidate(sslState->host);
     }
+    if (opt_no_ipcache)
+       ipcacheInvalidate(sslState->host);
     if (Config.sslProxy.host)
        sslProxyConnected(sslState->server.fd, sslState);
     else

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 9a81c15a71d49c28ab5a9db45ff1d924fecc0708..eb52b927a28e4d0e1e7cd96eaf163d19946e73bb 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.12 1996/08/26 19:57:11 wessels Exp $
+ * $Id: tunnel.cc,v 1.13 1996/08/31 06:40:20 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -427,9 +427,9 @@ static int sslConnect(fd, hp, sslState)
                (void *) sslState);
            return COMM_OK;
        }
-       if (opt_no_ipcache)
-           ipcacheInvalidate(sslState->host);
     }
+    if (opt_no_ipcache)
+       ipcacheInvalidate(sslState->host);
     if (Config.sslProxy.host)
        sslProxyConnected(sslState->server.fd, sslState);
     else