gindent

diff --git a/src/acl.cc b/src/acl.cc
index 36968cabc0e7ee71e4fc9ad13c0fbdd708e1caea..b4126bbab90e7ea5a4103db05b812a3aa28154ba 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.55 1996/11/01 21:24:58 wessels Exp $
+ * $Id: acl.cc,v 1.56 1996/11/02 00:17:40 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -209,7 +209,7 @@ static int
 decode_addr(char *asc, struct in_addr *addr, struct in_addr *mask)
 {
     u_num32 a = 0;
-    int a1=0, a2=0, a3=0, a4=0;
+    int a1 = 0, a2 = 0, a3 = 0, a4 = 0;
     struct hostent *hp = NULL;
 
     switch (sscanf(asc, "%d.%d.%d.%d", &a1, &a2, &a3, &a4)) {

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 6f622a94a33c7d695578580ed65c4ddda10e48d4..03cbd1855119f22ca14c25899580543f1c2a9b67 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.123 1996/11/01 21:31:03 wessels Exp $
+ * $Id: cache_cf.cc,v 1.124 1996/11/02 00:17:43 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -239,7 +239,6 @@ static void parseLocalDomainLine _PARAMS((void));
 static void parseMcastGroupLine _PARAMS((void));
 static void parseMemLine _PARAMS((void));
 static void parseMgrLine _PARAMS((void));
-static void parsePidFilenameLine _PARAMS((void));
 static void parseKilobytes _PARAMS((int *));
 static void parseSwapLine _PARAMS((void));
 static void parseRefreshPattern _PARAMS((int icase));

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 821c6a0f1ab532eaffef8d62716d62152236fa01..72524f60439f8590b6cfa43414fc31b60c7e1972 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.45 1996/10/15 16:40:05 wessels Exp $
+ * $Id: errorpage.cc,v 1.46 1996/11/02 00:17:45 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -157,6 +157,10 @@ squid_error_entry(StoreEntry * entry, log_type type, char *msg)
 {
     int error_index;
 
+    if (entry->store_status != STORE_PENDING) {
+       debug_trap("squid_error_entry() called on STORE_PENDING object");
+       return;
+    }
     if (type < ERR_MIN || type > ERR_MAX)
        fatal_dump("squid_error_entry: type out of range.");
     error_index = (int) (type - ERR_MIN);

diff --git a/src/gopher.cc b/src/gopher.cc
index 129bce002de899ab940e5b81b642a1f3a503ebb1..e9aa2039c78ffb104e8655bebf285bcf7d703e5d 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: gopher.cc,v 1.58 1996/11/01 07:43:44 wessels Exp $
+ * $Id: gopher.cc,v 1.59 1996/11/02 00:17:49 wessels Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -1030,7 +1030,7 @@ gopherConnectDone(int fd, int status, void *data)
        (PF) gopherSendRequest,
        (void *) gopherState, 0);
     if (Config.vizHackAddr.sin_port)
-        vizHackSendPkt(&gopherState->connectState.S, 2);
+       vizHackSendPkt(&gopherState->connectState.S, 2);
 }
 
 

diff --git a/src/http.cc b/src/http.cc
index 700ea72ad5aeeedef0b1cf9e89e0d1b789d55ef4..28defd65d56aaf5ed5813795d923dcbc27cf07bb 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: http.cc,v 1.91 1996/11/01 07:43:45 wessels Exp $
+ * $Id: http.cc,v 1.92 1996/11/02 00:17:51 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -749,8 +749,8 @@ httpConnectDone(int fd, int status, void *data)
            httpLifetimeExpire, (void *) httpState, 0);
        commSetSelect(fd, COMM_SELECT_WRITE,
            httpSendRequest, (void *) httpState, 0);
-    if (Config.vizHackAddr.sin_port)
-        vizHackSendPkt(&httpState->connectState.S, 2);
+       if (Config.vizHackAddr.sin_port)
+           vizHackSendPkt(&httpState->connectState.S, 2);
     }
 }
 

diff --git a/src/squid.h b/src/squid.h
index ea514179ba6311e23a42f1efcb4917d4d86dfd5f..c8f4a70e179a8fbc324ee32af84b7bd14e24f0d0 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.64 1996/11/01 21:25:05 wessels Exp $
+ * $Id: squid.h,v 1.65 1996/11/02 00:17:53 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -131,6 +131,9 @@
 #if USE_ASYNC_IO && HAVE_AIO_H
 #include <aio.h>
 #endif
+#if HAVE_GETOPT_H
+#include <getopt.h>
+#endif
 
 #ifdef __STDC__
 #include <stdarg.h>
@@ -143,8 +146,7 @@
 #include <syslog.h>
 #endif
 
-/* Only enable shadow password suite if both header and library exist */
-#if HAVE_SHADOW_H && HAVE_LIBSHADOW
+#if HAVE_SHADOW_H
 #include <shadow.h>
 #endif
 

diff --git a/src/ssl.cc b/src/ssl.cc
index f25f0510321ea3fe599eec2aa11feffb897d6468..e88cca9b683ada69f9b63c5855c2c3877cc7cfec 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.21 1996/11/01 07:43:48 wessels Exp $
+ * $Id: ssl.cc,v 1.22 1996/11/02 00:17:54 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -385,7 +385,7 @@ sslConnectDone(int fd, int status, void *data)
     else
        sslConnected(sslState->server.fd, sslState);
     if (Config.vizHackAddr.sin_port)
-        vizHackSendPkt(&sslState->connectState.S, 2);
+       vizHackSendPkt(&sslState->connectState.S, 2);
 }
 
 int

diff --git a/src/store.cc b/src/store.cc
index 92eaf4249361ee7a696982edf56691141a5d1f45..535708dbd4371e3a5b858e4b5ae7916ed1acf855 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.145 1996/11/01 21:25:09 wessels Exp $
+ * $Id: store.cc,v 1.146 1996/11/02 00:17:58 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -262,8 +262,8 @@ static int storelog_fd = -1;
 
 /* key temp buffer */
 static char key_temp_buffer[MAX_URL + 100];
-static char swaplog_file[SQUID_MAXPATHLEN+1];
-static char tmp_filename[SQUID_MAXPATHLEN+1];
+static char swaplog_file[SQUID_MAXPATHLEN + 1];
+static char tmp_filename[SQUID_MAXPATHLEN + 1];
 
 /* patch cache_dir to accomodate multiple disk storage */
 static char **CacheDirs = NULL;
@@ -1065,7 +1065,7 @@ storeAddSwapDisk(char *path)
 {
     char **tmp = NULL;
     int i;
-    if (strlen(path) > (SQUID_MAXPATHLEN-32))
+    if (strlen(path) > (SQUID_MAXPATHLEN - 32))
        fatal_dump("cache_dir pathname is too long");
     if (CacheDirs == NULL) {
        CacheDirsAllocated = 4;
@@ -1095,7 +1095,7 @@ swappath(int n)
 static char *
 storeSwapFullPath(int fn, char *fullpath)
 {
-    LOCAL_ARRAY(char, fullfilename, SQUID_MAXPATHLEN+1);
+    LOCAL_ARRAY(char, fullfilename, SQUID_MAXPATHLEN + 1);
     if (!fullpath)
        fullpath = fullfilename;
     fullpath[0] = '\0';
@@ -1251,7 +1251,7 @@ storeSwapLog(StoreEntry * e)
 static void
 storeSwapOutHandle(int fd, int flag, StoreEntry * e)
 {
-    LOCAL_ARRAY(char, filename, SQUID_MAXPATHLEN+1);
+    LOCAL_ARRAY(char, filename, SQUID_MAXPATHLEN + 1);
     MemObject *mem = e->mem_obj;
 
     debug(20, 3, "storeSwapOutHandle: '%s'\n", e->key);
@@ -1336,7 +1336,7 @@ storeSwapOutStart(StoreEntry * e)
 {
     int fd;
     int x;
-    LOCAL_ARRAY(char, swapfilename, SQUID_MAXPATHLEN+1);
+    LOCAL_ARRAY(char, swapfilename, SQUID_MAXPATHLEN + 1);
     MemObject *mem = e->mem_obj;
     /* Suggest a new swap file number */
     swapfileno = (swapfileno + 1) % (MAX_SWAP_FILE);
@@ -2481,7 +2481,7 @@ storeInit(void)
     storeSanityCheck();
     dir_created = storeVerifySwapDirs(opt_zap_disk_store);
     if (Config.Log.swap)
-        strncpy(swaplog_file, Config.Log.swap, SQUID_MAXPATHLEN);
+       strncpy(swaplog_file, Config.Log.swap, SQUID_MAXPATHLEN);
     else
        sprintf(swaplog_file, "%s/log", swappath(0));
     swaplog_fd = file_open(swaplog_file, NULL, O_WRONLY | O_CREAT);

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 93ae1ee9b25ca47ddcf6558b14b5f03d6bb7530f..024780f920df957293b1de90f7203b440fbadd8d 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.21 1996/11/01 07:43:48 wessels Exp $
+ * $Id: tunnel.cc,v 1.22 1996/11/02 00:17:54 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -385,7 +385,7 @@ sslConnectDone(int fd, int status, void *data)
     else
        sslConnected(sslState->server.fd, sslState);
     if (Config.vizHackAddr.sin_port)
-        vizHackSendPkt(&sslState->connectState.S, 2);
+       vizHackSendPkt(&sslState->connectState.S, 2);
 }
 
 int

diff --git a/src/wais.cc b/src/wais.cc
index 2bbfb96135bce252b6913d74cc9c5306c23b502e..2171a26e35afbb2ecb3cbe0f009a156c1b56cd26 100644 (file)
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.48 1996/11/01 07:43:48 wessels Exp $
+ * $Id: wais.cc,v 1.49 1996/11/02 00:18:00 wessels Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -410,5 +410,5 @@ waisConnectDone(int fd, int status, void *data)
        (PF) waisSendRequest,
        (void *) waisState, 0);
     if (Config.vizHackAddr.sin_port)
-        vizHackSendPkt(&waisState->connectState.S, 2);
+       vizHackSendPkt(&waisState->connectState.S, 2);
 }