gindent

diff --git a/src/acl.cc b/src/acl.cc
index 11b4f1a3c703ed97599f50e8ceb3435a783c35c5..d273e81ca0377d6f7fa595e7de71f8cb7bcb7560 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.192 1999/01/11 22:54:15 wessels Exp $
+ * $Id: acl.cc,v 1.193 1999/01/12 23:38:35 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -711,9 +711,9 @@ aclParseAclLine(acl ** head)
        break;
 #if SQUID_SNMP
     case ACL_SNMP_COMMUNITY:
-        aclParseWordList(&A->data);
+       aclParseWordList(&A->data);
        break;
-#endif  
+#endif
 #if USE_ARP_ACL
     case ACL_SRC_ARP:
        aclParseArpList(&A->data);
@@ -767,7 +767,7 @@ int
 aclIsProxyAuth(const char *name)
 {
     acl *a = aclFindByName(name);
-    if (a) 
+    if (a)
        return a->type == ACL_PROXY_AUTH;
     return 0;
 }
@@ -1009,7 +1009,7 @@ aclDecodeProxyAuth(const char *proxy_auth, char **user, char **password, char *b
  */
 
 static int
-aclMatchProxyAuth(wordlist * data, const char * proxy_auth, acl_proxy_auth_user * auth_user, aclCheck_t * checklist)
+aclMatchProxyAuth(wordlist * data, const char *proxy_auth, acl_proxy_auth_user * auth_user, aclCheck_t * checklist)
 {
     /* checklist is used to register user name when identified, nothing else */
     LOCAL_ARRAY(char, login_buf, USER_IDENT_SZ);
@@ -1028,7 +1028,7 @@ aclMatchProxyAuth(wordlist * data, const char * proxy_auth, acl_proxy_auth_user
         * be restricted the functions that deal with the authenticator.
         */
        assert(auth_user == checklist->auth_user);
-       checklist->auth_user = NULL; /* get rid of that special reference */
+       checklist->auth_user = NULL;    /* get rid of that special reference */
        /* Check result from external validation */
        if (auth_user->passwd_ok != 1) {
            /* password was checked but did not match */
@@ -1050,7 +1050,6 @@ aclMatchProxyAuth(wordlist * data, const char * proxy_auth, acl_proxy_auth_user
            /* Continue checking below, as normal */
        }
     }
-
     /* see if we already know this user */
     auth_user = hash_lookup(proxy_auth_cache, user);
 
@@ -1059,7 +1058,7 @@ aclMatchProxyAuth(wordlist * data, const char * proxy_auth, acl_proxy_auth_user
        debug(28, 4) ("aclMatchProxyAuth: user '%s' not yet known\n", user);
        return -1;
     } else if ((0 == strcmp(auth_user->passwd, password)) &&
-           (auth_user->expiretime > current_time.tv_sec)) {
+       (auth_user->expiretime > current_time.tv_sec)) {
        /* user already known and valid */
        debug(28, 5) ("aclMatchProxyAuth: user '%s' previously validated\n",
            user);
@@ -1325,16 +1324,16 @@ aclMatchAcl(acl * ae, aclCheck_t * checklist)
        if (!r->flags.accelerated) {
            /* Proxy authorization on proxy requests */
            header = httpHeaderGetStr(&checklist->request->header,
-                   HDR_PROXY_AUTHORIZATION);
+               HDR_PROXY_AUTHORIZATION);
        } else if (r->flags.internal) {
            /* WWW authorization on accelerated internal requests */
            header = httpHeaderGetStr(&checklist->request->header,
-                   HDR_AUTHORIZATION);
+               HDR_AUTHORIZATION);
        } else {
 #if AUTH_ON_ACCELERATION
            /* WWW authorization on accelerated requests */
            header = httpHeaderGetStr(&checklist->request->header,
-                   HDR_AUTHORIZATION);
+               HDR_AUTHORIZATION);
 #else
            debug(28, 1) ("aclMatchAcl: proxy_auth %s not applicable on accelerated requests.\n", ae->name);
            return -1;
@@ -1346,10 +1345,10 @@ aclMatchAcl(acl * ae, aclCheck_t * checklist)
         */
        r->flags.used_proxy_auth = 1;
        /* Check the password */
-       switch (aclMatchProxyAuth(ae->data, 
-                   header,
-                   checklist->auth_user,
-                   checklist)) {
+       switch (aclMatchProxyAuth(ae->data,
+               header,
+               checklist->auth_user,
+               checklist)) {
        case 0:
            /* Correct password, but was not allowed in this ACL */
            return 0;

diff --git a/src/client.cc b/src/client.cc
index 473bd4254510ce4cbd1c7af2a560792144aea0f6..8534f100c015d58018db1d70b342954c26ce51ea 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,6 +1,7 @@
 
+
 /*
- * $Id: client.cc,v 1.79 1998/11/25 09:00:19 wessels Exp $
+ * $Id: client.cc,v 1.80 1999/01/12 23:38:36 wessels Exp $
  *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index acf53db7863844861e5b887482d6ecfb6a93388a..c39dcc8ab0f9a27e751093c0315bb778cfe8adce 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: snmp_core.cc,v 1.25 1999/01/11 21:55:40 wessels Exp $
+ * $Id: snmp_core.cc,v 1.26 1999/01/12 23:38:37 wessels Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -552,7 +552,7 @@ snmpDecodePacket(snmp_request_t * rq)
     debug(49, 5) ("snmpDecodePacket: Called.\n");
     /* Now that we have the data, turn it into a PDU */
     PDU = snmp_pdu_create(0);
-    Session.Version = SNMP_VERSION_1; 
+    Session.Version = SNMP_VERSION_1;
     Community = snmp_parse(&Session, PDU, buf, len);
 
     checklist.src_addr = rq->from.sin_addr;

diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index b2211434e0deb9d59ecb58a88ea2af2ec3ca845a..2d509d9a3fea043006ac1350cb3c508dfb8c6d8e 100644 (file)
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_rebuild.cc,v 1.53 1998/12/02 05:07:25 wessels Exp $
+ * $Id: store_rebuild.cc,v 1.54 1999/01/12 23:38:39 wessels Exp $
  *
  * DEBUG: section 20    Store Rebuild Routines
  * AUTHOR: Duane Wessels
@@ -157,7 +157,7 @@ storeRebuildFromDirectory(rebuild_dir * d)
        swap_hdr_len = 0;
 #if USE_TRUNCATE_NOT_UNLINK
        if (sb.st_size == 0)
-               continue;
+           continue;
 #endif
        tlv_list = storeSwapMetaUnpack(hdr_buf, &swap_hdr_len);
        if (tlv_list == NULL) {

diff --git a/src/structs.h b/src/structs.h
index 2fb1a5ebd189d908a9fca549faf95f0c5ae805d8..309e628bd93d447bccc2d4349a847e8c8f7b1ff5 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,7 +1,8 @@
 
 
+
 /*
- * $Id: structs.h,v 1.258 1999/01/12 23:37:52 wessels Exp $
+ * $Id: structs.h,v 1.259 1999/01/12 23:38:40 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/

diff --git a/src/url.cc b/src/url.cc
index 72cdcf3b5255917f1960c20f7e6885f1383e94a8..d303e1e1bd66f70b8c1bc8a77fca289e6123a768 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.111 1998/12/15 17:33:59 wessels Exp $
+ * $Id: url.cc,v 1.112 1999/01/12 23:38:41 wessels Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -352,7 +352,7 @@ urlCanonicalClean(const request_t * request)
             * strip arguments AFTER a question-mark
             */
            if (Config.onoff.strip_query_terms)
-               if ((t = strchr(buf, '?')))
+               if ((t = strchr(buf, '?')))
                    *(++t) = '\0';
            break;
        }