From: wessels <>
Date: Tue, 16 Apr 1996 11:13:33 +0000 (+0000)
Subject: gindent
X-Git-Tag: SQUID_3_0_PRE1~6156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cd0ab45110c6a6105261e65fc57733b481c3042;p=thirdparty%2Fsquid.git

gindent
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 4425416dd5..ba29d4b2fc 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,4 +1,4 @@
-/* $Id: cache_cf.cc,v 1.44 1996/04/16 05:05:17 wessels Exp $ */
+/* $Id: cache_cf.cc,v 1.45 1996/04/16 05:13:33 wessels Exp $ */
 
 /* DEBUG: Section 3             cache_cf: Configuration file parsing */
 
@@ -1070,7 +1070,7 @@ int parseConfigFile(file_name)
     }
     cfg_filename = file_name;
     if ((token = strrchr(cfg_filename, '/')))
-	cfg_filename = token+1;
+	cfg_filename = token + 1;
     memset(config_input_line, '\0', BUFSIZ);
     config_lineno = 0;
     while (fgets(config_input_line, BUFSIZ, fp)) {
diff --git a/src/http.cc b/src/http.cc
index dcc00aa384..c028ea30c0 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,4 +1,4 @@
-/* $Id: http.cc,v 1.49 1996/04/16 05:05:23 wessels Exp $ */
+/* $Id: http.cc,v 1.50 1996/04/16 05:13:34 wessels Exp $ */
 
 /*
  * DEBUG: Section 11          http: HTTP
@@ -520,7 +520,7 @@ int proxyhttpStart(e, url, entry)
     data = (HttpData *) xcalloc(1, sizeof(HttpData));
     data->entry = entry;
     data->req_hdr = entry->mem_obj->mime_hdr;
-    request = (request_t *) xcalloc (1, sizeof(request_t));
+    request = (request_t *) xcalloc(1, sizeof(request_t));
     data->free_request = 1;
     data->REQ = request;
 
diff --git a/src/squid.h b/src/squid.h
index 10c15157e7..66e06dfa44 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,5 +1,5 @@
 
-/* $Id: squid.h,v 1.18 1996/04/16 05:05:29 wessels Exp $ */
+/* $Id: squid.h,v 1.19 1996/04/16 05:13:37 wessels Exp $ */
 
 #include "config.h"
 #include "autoconf.h"
@@ -98,7 +98,7 @@ typedef unsigned long u_num32;
 #include "url.h"
 #include "proto.h"
 #include "icp.h"
-#include "errorpage.h"	/* must go after icp.h */
+#include "errorpage.h"		/* must go after icp.h */
 #include "ipcache.h"
 #include "mime.h"
 #include "neighbors.h"
diff --git a/src/url.cc b/src/url.cc
index bf9c2e492f..5daf6ecc09 100644
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,4 +1,4 @@
-/* $Id: url.cc,v 1.17 1996/04/16 04:23:17 wessels Exp $ */
+/* $Id: url.cc,v 1.18 1996/04/16 05:13:37 wessels Exp $ */
 
 /* 
  * DEBUG: Section 23          url
@@ -163,12 +163,12 @@ int urlDefaultPort(p)
 }
 
 request_t *urlParse(method, url)
-	method_t method;
-	char *url;
+     method_t method;
+     char *url;
 {
-    static char proto[MAX_URL+1];
-    static char host[MAX_URL+1];
-    static char urlpath[MAX_URL+1];
+    static char proto[MAX_URL + 1];
+    static char host[MAX_URL + 1];
+    static char urlpath[MAX_URL + 1];
     request_t *request = NULL;
     char *t = NULL;
     int port;
@@ -179,26 +179,25 @@ request_t *urlParse(method, url)
 	port = CONNECT_PORT;
 	if (sscanf(url, "%[^:]:%d", host, &port) < 1)
 	    return NULL;
-        if (!aclMatchInteger(connect_port_list, port))
+	if (!aclMatchInteger(connect_port_list, port))
 	    return NULL;
     } else {
 	if (sscanf(url, "%[^:]://%[^/]%s", proto, host, urlpath) < 2)
 	    return NULL;
 	protocol = urlParseProtocol(proto);
 	port = urlDefaultPort(protocol);
-	if ((t = strchr(host, ':')) && *(t+1) != '\0') {
+	if ((t = strchr(host, ':')) && *(t + 1) != '\0') {
 	    *t = '\0';
 	    port = atoi(t + 1);
 	}
     }
     for (t = host; *t; t++)
-        *t = tolower(*t);
+	*t = tolower(*t);
     if (port == 0) {
-	debug(23,0,"urlParse: Invalid port == 0\n");
+	debug(23, 0, "urlParse: Invalid port == 0\n");
 	return NULL;
     }
-
-    request = (request_t *) xcalloc (1, sizeof(request_t));
+    request = (request_t *) xcalloc(1, sizeof(request_t));
     request->method = method;
     request->protocol = protocol;
     strncpy(request->host, host, SQUIDHOSTNAMELEN);
@@ -207,27 +206,27 @@ request_t *urlParse(method, url)
     return request;
 }
 
-char *urlCanonical (request, buf)
-    request_t *request;
-    char *buf;
+char *urlCanonical(request, buf)
+     request_t *request;
+     char *buf;
 {
-    static char urlbuf[MAX_URL+1];
+    static char urlbuf[MAX_URL + 1];
     static char portbuf[32];
     if (buf == NULL)
 	buf = urlbuf;
     switch (request->method) {
     case METHOD_CONNECT:
-        sprintf(buf, "%s:%d", request->host, request->port);
+	sprintf(buf, "%s:%d", request->host, request->port);
 	break;
     default:
 	portbuf[0] = '\0';
 	if (request->port != urlDefaultPort(request->protocol))
-		sprintf(portbuf, ":%d", request->port);
-        sprintf(buf, "%s://%s%s%s",
-		ProtocolStr[request->protocol],
-		request->host,
-		portbuf,
-		request->urlpath);
+	    sprintf(portbuf, ":%d", request->port);
+	sprintf(buf, "%s://%s%s%s",
+	    ProtocolStr[request->protocol],
+	    request->host,
+	    portbuf,
+	    request->urlpath);
 	break;
     }
     return buf;
diff --git a/src/wais.cc b/src/wais.cc
index f7296e7b0a..f8dcf91fef 100644
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,4 +1,4 @@
-/* $Id: wais.cc,v 1.26 1996/04/16 05:05:35 wessels Exp $ */
+/* $Id: wais.cc,v 1.27 1996/04/16 05:13:39 wessels Exp $ */
 
 /*
  * DEBUG: Section 24          wais
@@ -250,7 +250,6 @@ int waisStart(unusedfd, url, method, mime_hdr, entry)
 	safe_free(data);
 	return COMM_ERROR;
     }
-
     /* Create socket. */
     sock = comm_open(COMM_NONBLOCKING, 0, 0, url);
     if (sock == COMM_ERROR) {