From: wessels <>
Date: Tue, 17 Sep 1996 03:20:45 +0000 (+0000)
Subject: gindent
X-Git-Tag: SQUID_3_0_PRE1~5779
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc6a9d2ea0f550c187d93f157110a0ea766c228e;p=thirdparty%2Fsquid.git

gindent
---

diff --git a/src/comm.cc b/src/comm.cc
index 5139f45cda..863bdf69ad 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.71 1996/09/16 21:11:05 wessels Exp $
+ * $Id: comm.cc,v 1.72 1996/09/16 21:20:45 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -225,11 +225,11 @@ commBind(int s, struct in_addr in_addr, u_short port)
  * is OR of flags specified in comm.h. */
 int
 comm_open(int sock_type,
-	int proto,
-	struct in_addr addr,
-	u_short port,
-	int flags,
-	char *note)
+    int proto,
+    struct in_addr addr,
+    u_short port,
+    int flags,
+    char *note)
 {
     int new_socket;
     FD_ENTRY *conn = NULL;
diff --git a/src/dns.cc b/src/dns.cc
index 0f80c9ee76..e64615430f 100644
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: dns.cc,v 1.9 1996/09/16 21:11:06 wessels Exp $
+ * $Id: dns.cc,v 1.10 1996/09/16 21:20:45 wessels Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -158,11 +158,11 @@ dnsOpenServer(char *command)
 	comm_close(cfd);	/* close shared socket with child */
 	/* open new socket for parent process */
 	sfd = comm_open(SOCK_STREAM,
-		0,		/* protocol */
-		local_addr,
-		0,		/* port */
-		0,		/* flags */
-		NULL);	/* blocking! */
+	    0,			/* protocol */
+	    local_addr,
+	    0,			/* port */
+	    0,			/* flags */
+	    NULL);		/* blocking! */
 	if (sfd == COMM_ERROR)
 	    return -1;
 	if (comm_connect(sfd, localhost, port) == COMM_ERROR) {
diff --git a/src/icmp.cc b/src/icmp.cc
index d9e9d6abce..6ffdbb6151 100644
--- a/src/icmp.cc
+++ b/src/icmp.cc
@@ -122,7 +122,7 @@ icmpOpen(void)
 	COMM_SELECT_READ,
 	(PF) icmpRecv,
 	(void *) -1);
-    debug(37, 0, "icmpOpen: icmp_sock opened on FD %d\n", icmp_sock);
+    debug(37, 0, "ICMP socket opened on FD %d\n", icmp_sock);
 }
 
 void
diff --git a/src/ident.cc b/src/ident.cc
index b4a3ca3dc3..658d859e08 100644
--- a/src/ident.cc
+++ b/src/ident.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ident.cc,v 1.13 1996/09/16 21:11:09 wessels Exp $
+ * $Id: ident.cc,v 1.14 1996/09/16 21:20:47 wessels Exp $
  *
  * DEBUG: section 30    Ident (RFC 931)
  * AUTHOR: Duane Wessels
@@ -56,11 +56,11 @@ identStart(int sock, icpStateData * icpState)
 
     if (sock < 0) {
 	sock = comm_open(SOCK_STREAM,
-		0,
-		Config.Addrs.tcp_outgoing,
-		0,
-		COMM_NONBLOCKING,
-		"ident");
+	    0,
+	    Config.Addrs.tcp_outgoing,
+	    0,
+	    COMM_NONBLOCKING,
+	    "ident");
 	if (sock == COMM_ERROR)
 	    return;
     }
diff --git a/src/ipcache.cc b/src/ipcache.cc
index 2582748d6f..96ac4aeed6 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ipcache.cc,v 1.60 1996/09/16 21:11:10 wessels Exp $
+ * $Id: ipcache.cc,v 1.61 1996/09/16 21:20:47 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -882,7 +882,7 @@ ipcacheStatPrint(ipcache_entry * i, StoreEntry * sentry)
 	i->addr_count);
     for (k = 0; k < (int) i->addr_count; k++)
 	storeAppendPrintf(sentry, " %15s",
-		inet_ntoa(inaddrFromHostent(&i->entry)));
+	    inet_ntoa(inaddrFromHostent(&i->entry)));
     for (k = 0; k < (int) i->alias_count; k++)
 	storeAppendPrintf(sentry, " %s", i->entry.h_aliases[k]);
     if (i->entry.h_name && strncmp(i->name, i->entry.h_name, MAX_LINELEN))
diff --git a/src/main.cc b/src/main.cc
index ce9b7a56ef..3d07349891 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: main.cc,v 1.76 1996/09/16 21:11:11 wessels Exp $
+ * $Id: main.cc,v 1.77 1996/09/16 21:20:48 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -359,10 +359,10 @@ serverConnectionsOpen()
 
 	    if ((addr = Config.Addrs.udp_outgoing).s_addr != INADDR_NONE) {
 		theOutIcpConnection = comm_open(SOCK_DGRAM,
-			0,
+		    0,
 		    addr,
 		    port,
-			COMM_NONBLOCKING,
+		    COMM_NONBLOCKING,
 		    "ICP Port");
 		if (theOutIcpConnection < 0)
 		    fatal("Cannot open Outgoing ICP Port");
diff --git a/src/redirect.cc b/src/redirect.cc
index f2ce4622ea..99f573e810 100644
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: redirect.cc,v 1.16 1996/09/16 21:11:13 wessels Exp $
+ * $Id: redirect.cc,v 1.17 1996/09/16 21:20:49 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -124,11 +124,11 @@ redirectCreateRedirector(char *command)
 	comm_close(cfd);	/* close shared socket with child */
 	/* open new socket for parent process */
 	sfd = comm_open(SOCK_STREAM,
-		0,
-		local_addr,
-		0,
-		0,
-		NULL);	/* blocking! */
+	    0,
+	    local_addr,
+	    0,
+	    0,
+	    NULL);		/* blocking! */
 	if (sfd == COMM_ERROR)
 	    return -1;
 	if (comm_connect(sfd, localhost, port) == COMM_ERROR) {
diff --git a/src/store.cc b/src/store.cc
index 8271b22029..eddf7dfdf7 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.111 1996/09/15 08:06:31 wessels Exp $
+ * $Id: store.cc,v 1.112 1996/09/16 21:20:49 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -2676,7 +2676,6 @@ storeWriteCleanLog(void)
 	return 0;
     }
     for (e = storeGetFirst(); e; e = storeGetNext()) {
-	debug(20, 5, "storeWriteCleanLog: <URL:%s>\n", e->url);
 	if (e->swap_file_number < 0)
 	    continue;
 	if (e->swap_status != SWAP_OK)
diff --git a/src/tools.cc b/src/tools.cc
index f29a91f4c4..6cbf5026b3 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.58 1996/09/16 21:11:16 wessels Exp $
+ * $Id: tools.cc,v 1.59 1996/09/16 21:20:50 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -625,7 +625,7 @@ accessLogTime(time_t t)
 struct in_addr
 inaddrFromHostent(struct hostent *hp)
 {
-	struct in_addr s;
-	memcpy(&s.s_addr, hp->h_addr, sizeof(s.s_addr));
-	return s;
+    struct in_addr s;
+    memcpy(&s.s_addr, hp->h_addr, sizeof(s.s_addr));
+    return s;
 }