gindent

diff --git a/include/md5.h b/include/md5.h
index 26a678998f8515bd8e85a5d6806b47aadf3f327c..e8387c05c3b4e3f4a9fa3134f6f66e699604effd 100644 (file)
--- a/include/md5.h
+++ b/include/md5.h
@@ -32,10 +32,10 @@ typedef struct {
     unsigned char buffer[64];  /* input buffer */
 } MD5_CTX;
 
-void MD5Init (MD5_CTX *);
-void MD5Update (MD5_CTX *, unsigned char *, unsigned int);
-void MD5Final (unsigned char[16], MD5_CTX *);
+void MD5Init(MD5_CTX *);
+void MD5Update(MD5_CTX *, unsigned char *, unsigned int);
+void MD5Final(unsigned char[16], MD5_CTX *);
 
 #define MD5_DIGEST_CHARS         16
 
-#endif MD5_H
+#endif /* MD5_H */

diff --git a/include/util.h b/include/util.h
index 4e7f4a07663efe9e2b27201ec4813dceed95daea..e4a74809bfb2b4d176383f27240525a34a32a24a 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.36 1997/12/06 19:03:12 wessels Exp $
+ * $Id: util.h,v 1.37 1997/12/30 02:50:32 wessels Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -160,10 +160,10 @@ extern time_t parse_iso3307_time(const char *buf);
 extern char *base64_decode(const char *coded);
 
 typedef struct _String {
-        char *buf;
-        off_t off;
-        size_t len;
-        int refcount;
+    char *buf;
+    off_t off;
+    size_t len;
+    int refcount;
 } String;
 
 extern String *stringCreate(size_t);

diff --git a/lib/base64.c b/lib/base64.c
index 930037170a0f36a5a2aa59e67d2d0e56cdee03f1..89dc02e9b5c22f1ecb9a645e173dee6fdd994cb9 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -1,3 +1,4 @@
+
 #include "config.h"
 
 #if HAVE_STDIO_H

diff --git a/lib/md5.c b/lib/md5.c
index 0a3cab690d870f24f9bc578d2e58f4be889baff2..29cd74a1042894d56a3ae8be506ebe571612f266 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -51,11 +51,11 @@
 #define S43 15
 #define S44 21
 
-static void MD5Transform (u_num32[4], unsigned char[64]);
-static void Encode (unsigned char *, u_num32 *, unsigned int);
-static void Decode (u_num32 *, unsigned char *, unsigned int);
-static void MD5_memcpy (char *, char *, unsigned int);
-static void MD5_memset (char *, int, unsigned int);
+static void MD5Transform(u_num32[4], unsigned char[64]);
+static void Encode(unsigned char *, u_num32 *, unsigned int);
+static void Decode(u_num32 *, unsigned char *, unsigned int);
+static void MD5_memcpy(char *, char *, unsigned int);
+static void MD5_memset(char *, int, unsigned int);
 
 static unsigned char PADDING[64] =
 {
@@ -106,7 +106,7 @@ static unsigned char PADDING[64] =
  * MD5 initialization. Begins an MD5 operation, writing a new context.
  */
 void
-MD5Init(MD5_CTX *context)
+MD5Init(MD5_CTX * context)
 {
     context->count[0] = context->count[1] = 0;
     /*
@@ -123,7 +123,7 @@ MD5Init(MD5_CTX *context)
  * processing another message block, and updating the context.
  */
 void
-MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
+MD5Update(MD5_CTX * context, unsigned char *input, unsigned int inputLen)
 {
     unsigned int i, index, partLen;
 
@@ -163,7 +163,7 @@ MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
  * message digest and zeroizing the context.
  */
 void
-MD5Final(unsigned char digest[16], MD5_CTX *context)
+MD5Final(unsigned char digest[16], MD5_CTX * context)
 {
     unsigned char bits[8];
     unsigned int index, padLen;
@@ -186,7 +186,7 @@ MD5Final(unsigned char digest[16], MD5_CTX *context)
     /*
      * Zeroize sensitive information.
      */
-    MD5_memset((char *)context, 0, sizeof(*context));
+    MD5_memset((char *) context, 0, sizeof(*context));
 }
 
 /*
@@ -279,7 +279,7 @@ MD5Transform(u_num32 state[4], unsigned char block[64])
     /*
      * Zeroize sensitive information.
      */
-    MD5_memset((char *)x, 0, sizeof(x));
+    MD5_memset((char *) x, 0, sizeof(x));
 }
 
 /*
@@ -287,7 +287,7 @@ MD5Transform(u_num32 state[4], unsigned char block[64])
  * multiple of 4.
  */
 static void
-Encode(unsigned char *output, u_num32 *input, unsigned int len)
+Encode(unsigned char *output, u_num32 * input, unsigned int len)
 {
     unsigned int i, j;
 
@@ -304,7 +304,7 @@ Encode(unsigned char *output, u_num32 *input, unsigned int len)
  * multiple of 4.
  */
 static void
-Decode(u_num32 *output, unsigned char *input, unsigned int len)
+Decode(u_num32 * output, unsigned char *input, unsigned int len)
 {
     unsigned int i, j;
 
@@ -318,7 +318,7 @@ Decode(u_num32 *output, unsigned char *input, unsigned int len)
  */
 
 static void
-MD5_memcpy(char * output, char * input, unsigned int len)
+MD5_memcpy(char *output, char *input, unsigned int len)
 {
     unsigned int i;
     for (i = 0; i < len; i++)
@@ -329,7 +329,7 @@ MD5_memcpy(char * output, char * input, unsigned int len)
  * Note: Replace "for loop" with standard memset if possible.
  */
 static void
-MD5_memset(char * output, int value, unsigned int len)
+MD5_memset(char *output, int value, unsigned int len)
 {
     unsigned int i;
     for (i = 0; i < len; i++)

diff --git a/lib/radix.c b/lib/radix.c
index 5965caa3691b679771e363db46622b503a273e65..ff4d656ba72af6023258e9b622a737a62fe7749d 100644 (file)
--- a/lib/radix.c
+++ b/lib/radix.c
@@ -234,7 +234,7 @@ rn_lookup(v_arg, m_arg, head)
 }
 
 static
-int 
+int
 rn_satsifies_leaf(trial, leaf, skip)
      char *trial;
      register struct radix_node *leaf;

diff --git a/lib/rfc1123.c b/lib/rfc1123.c
index 111cca0b2c04c11417dca42f8e6205e3b4d36e4a..87cf4c6e3914a0e38677ac4e96cec4edd1c0a246 100644 (file)
--- a/lib/rfc1123.c
+++ b/lib/rfc1123.c
@@ -1,5 +1,6 @@
+
 /*
- * $Id: rfc1123.c,v 1.9 1997/10/30 02:01:41 wessels Exp $
+ * $Id: rfc1123.c,v 1.10 1997/12/30 02:50:36 wessels Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived

diff --git a/src/client.cc b/src/client.cc
index e4e7293f104c16419a29cb360df41c05d7ec09fa..9f0e185a3328cbc8af59dc514471fa2f7b67b682 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,7 +1,8 @@
 
 
+
 /*
- * $Id: client.cc,v 1.45 1997/12/02 00:17:31 wessels Exp $
+ * $Id: client.cc,v 1.46 1997/12/30 02:47:38 wessels Exp $
  *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived

diff --git a/src/client_side.cc b/src/client_side.cc
index c8fa212e33d8ccc81ece8f7ea18ae5664b447a28..a600859b8aeb7aff5a2fcd3c317654c3fe71114f 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.178 1997/12/30 02:47:03 wessels Exp $
+ * $Id: client_side.cc,v 1.179 1997/12/30 02:47:39 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1223,11 +1223,11 @@ clientProcessRequest(clientHttpRequest * http)
            storeReleaseRequest(http->entry);
            storeBuffer(http->entry);
            hdr = httpReplyHeader(1.0,
-               HTTP_OK,
-               "text/plain",
-               r->headers_sz,
-               0,
-               squid_curtime);
+               HTTP_OK,
+               "text/plain",
+               r->headers_sz,
+               0,
+               squid_curtime);
            storeAppend(http->entry, hdr, strlen(hdr));
            storeAppend(http->entry, "\r\n", 2);
            storeAppend(http->entry, r->headers, r->headers_sz);

diff --git a/src/comm.cc b/src/comm.cc
index 59af5ac62e90791cf7743d6e73e161a5ef048abb..bf07cd2fb9c1e115e1962206701a3230886c3883 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.213 1997/12/03 04:39:07 wessels Exp $
+ * $Id: comm.cc,v 1.214 1997/12/30 02:47:40 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -503,7 +503,7 @@ comm_connect_addr(int sock, const struct sockaddr_in *address)
             * we get into fast loops on EALREADY.  select(2) continually
             * says the FD is ready for writing, but connect always
             * returns EALREADY. I applied a patch (PHNE_12906) but
-            * it didn't help.  -DW Dec 1, 1997
+            * it didn't help.  -DW Dec 1, 1997
             */
            debug(50, 1) ("connect: %s:%d: %s.\n",
                fqdnFromAddr(address->sin_addr),

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 487348e27f7ffcbee79911be75035a8062af0e14..9865005033e1ecfcc72625c9fc85cdee4ced142d 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.74 1997/12/03 01:31:59 wessels Exp $
+ * $Id: fqdncache.cc,v 1.75 1997/12/30 02:47:41 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -906,7 +906,7 @@ fqdncache_restart(void)
 
 #ifdef SQUID_SNMP
 u_char *
-var_fqdn_entry(struct variable * vp, oid * name, int *length, int exact, int
+var_fqdn_entry(struct variable *vp, oid * name, int *length, int exact, int
     *var_len,
     SNMPWM ** write_method)
 {
@@ -933,48 +933,49 @@ var_fqdn_entry(struct variable * vp, oid * name, int *length, int exact, int
     fq = NULL;
     i = 0;
     while (fq != NULL) {
-        newname[vp->namelen] = i + 1;
-        result = compare(name, *length, newname, (int) vp->namelen + 1);
-        if ((exact && (result == 0)) || (!exact && (result < 0))) {
-            debug(49, 5) ("snmp var_fqdn_entry: yup, a match.\n");
-            break;
-        }
-        i++;
-        fq = NULL;
+       newname[vp->namelen] = i + 1;
+       result = compare(name, *length, newname, (int) vp->namelen + 1);
+       if ((exact && (result == 0)) || (!exact && (result < 0))) {
+           debug(49, 5) ("snmp var_fqdn_entry: yup, a match.\n");
+           break;
+       }
+       i++;
+       fq = NULL;
     }
     if (fq == NULL)
-        return NULL;
+       return NULL;
 
     debug(49, 5) ("hey, matched.\n");
-    memcpy((char *) name, (char *) newname, ((int) vp->namelen + 1) * sizeof(oid));    *length = vp->namelen + 1;
+    memcpy((char *) name, (char *) newname, ((int) vp->namelen + 1) * sizeof(oid));
+    *length = vp->namelen + 1;
     *write_method = 0;
-    *var_len = sizeof(long);    /* default length */
+    *var_len = sizeof(long);   /* default length */
     sprint_objid(snbuf, newname, *length);
     debug(49, 5) ("snmp var_fqdn_entry  request for %s (%d)\n", snbuf, current);
 
     switch (vp->magic) {
     case NET_FQDN_ID:
-        long_return = (long) i;
-        return (u_char *) & long_return;
+       long_return = (long) i;
+       return (u_char *) & long_return;
     case NET_FQDN_NAME:
-        cp = fq->names[0];
-        *var_len = strlen(cp);
-        return (u_char *) cp;
+       cp = fq->names[0];
+       *var_len = strlen(cp);
+       return (u_char *) cp;
     case NET_FQDN_IP:
-        safe_inet_addr(fq->name, &fqaddr);
-        long_return = (long) fqaddr.s_addr;
-        return (u_char *) & long_return;
+       safe_inet_addr(fq->name, &fqaddr);
+       long_return = (long) fqaddr.s_addr;
+       return (u_char *) & long_return;
     case NET_FQDN_LASTREF:
-        long_return = fq->lastref;
-        return (u_char *) & long_return;
+       long_return = fq->lastref;
+       return (u_char *) & long_return;
     case NET_FQDN_EXPIRES:
-        long_return = fq->expires;
-        return (u_char *) & long_return;
+       long_return = fq->expires;
+       return (u_char *) & long_return;
     case NET_FQDN_STATE:
-        long_return = fq->status;
-        return (u_char *) & long_return;
+       long_return = fq->status;
+       return (u_char *) & long_return;
     default:
-        return NULL;
+       return NULL;
     }
 }
 #endif

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 9674c99c0459f0ed111c00168b4706c97913bb75..6b4b6b2eb435a6b784615de9d5c8cbd1100b7809 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.150 1997/12/02 17:59:34 kostas Exp $
+ * $Id: ipcache.cc,v 1.151 1997/12/30 02:47:42 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -1071,7 +1071,7 @@ ipcache_restart(void)
 #ifdef SQUID_SNMP
 
 u_char *
-var_ipcache_entry(struct variable * vp, oid * name, int *length, int exact, int *var_len,
+var_ipcache_entry(struct variable *vp, oid * name, int *length, int exact, int *var_len,
     SNMPWM ** write_method)
 {
     static char snbuf[256], *cp;
@@ -1081,7 +1081,7 @@ var_ipcache_entry(struct variable * vp, oid * name, int *length, int exact, int
     int result;
     dlink_node *m = NULL;
     ipcache_entry *IPc;
-       int cnt=1;
+    int cnt = 1;
 
     debug(49, 3) ("snmp: var_ipcache_entry called with magic=%d\n", vp->magic);
     debug(49, 3) ("snmp: var_ipcache_entry with (%d,%d)\n", *length, *var_len);
@@ -1094,37 +1094,37 @@ var_ipcache_entry(struct variable * vp, oid * name, int *length, int exact, int
     debug(49, 5) ("snmp var_ipcache_entry: hey, here we are.\n");
 
 
-        for (m = lru_list.head; m; m = m->next, cnt++) {
-        newname[vp->namelen] = cnt;
-        result = compare(name, *length, newname, (int) vp->namelen + 1);
-        if ((exact && (result == 0)) || (!exact && (result < 0))) {
-            debug(49, 5) ("snmp var_ipcache_entry: yup, a match.\n");
-            break;
-         }
+    for (m = lru_list.head; m; m = m->next, cnt++) {
+       newname[vp->namelen] = cnt;
+       result = compare(name, *length, newname, (int) vp->namelen + 1);
+       if ((exact && (result == 0)) || (!exact && (result < 0))) {
+           debug(49, 5) ("snmp var_ipcache_entry: yup, a match.\n");
+           break;
        }
-       
+    }
+
     if (m == NULL)
-        return NULL;
+       return NULL;
     if ((IPc = m->data) == NULL)
-        return NULL;
+       return NULL;
 
     current++;
     switch (vp->magic) {
     case NET_IPC_ID:
-        long_return = (int) cnt;
-        return (u_char *) & long_return;
+       long_return = (int) cnt;
+       return (u_char *) & long_return;
     case NET_IPC_NAME:
-        cp = IPc->name;
-        *var_len = strlen(cp);
-        return (u_char *) cp;
+       cp = IPc->name;
+       *var_len = strlen(cp);
+       return (u_char *) cp;
     case NET_IPC_IP:
-        long_return = IPc->addrs.in_addrs[0].s_addr;    /* first one only */
-        return (u_char *) & long_return;
+       long_return = IPc->addrs.in_addrs[0].s_addr;    /* first one only */
+       return (u_char *) & long_return;
     case NET_IPC_STATE:
-        long_return = IPc->status;
-        return (u_char *) & long_return;
+       long_return = IPc->status;
+       return (u_char *) & long_return;
     default:
-        return NULL;
+       return NULL;
     }
 }
 #endif

diff --git a/src/net_db.cc b/src/net_db.cc
index e0de4251bfc6da033b8ccb7315e3845aca56bf1c..aa19761fcb49fc21ec76182e0e14874ee6b60da4 100644 (file)
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.55 1997/12/06 05:16:57 wessels Exp $
+ * $Id: net_db.cc,v 1.56 1997/12/30 02:47:42 wessels Exp $
  *
  * DEBUG: section 37    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -667,13 +667,13 @@ netdbUpdatePeer(request_t * r, peer * e, int irtt, int ihops)
 
 #ifdef SQUID_SNMP
 u_char *
-var_netdb_entry(struct variable * vp, oid * name, int *length, int exact, int *var_len, SNMPWM ** write_method)
+var_netdb_entry(struct variable *vp, oid * name, int *length, int exact, int *var_len, SNMPWM ** write_method)
 {
     oid newname[MAX_NAME_LEN];
     static char snbuf[256];
     static netdbEntry *n = NULL;
     static long long_return;
-       int cnt=1;
+    int cnt = 1;
     int result;
 
     debug(49, 3) ("snmp: var_netdb_entry called with magic=%d\n", vp->magic);
@@ -686,56 +686,56 @@ var_netdb_entry(struct variable * vp, oid * name, int *length, int exact, int *v
 
     debug(49, 5) ("snmp var_netdb_entry: hey, here we are.\n");
 #ifdef USE_ICMP
-    n=netdbGetFirst(addr_table);
+    n = netdbGetFirst(addr_table);
 
     while (n != NULL) {
-        newname[vp->namelen] = cnt++;
-        result = compare(name, *length, newname, (int) vp->namelen + 1);
-        if ((exact && (result == 0)) || (!exact && (result < 0))) {
-            debug(49, 5) ("snmp var_netdb_entry: yup, a match.\n");
-            break;
-        }
-        n=netdbGetNext(addr_table);
+       newname[vp->namelen] = cnt++;
+       result = compare(name, *length, newname, (int) vp->namelen + 1);
+       if ((exact && (result == 0)) || (!exact && (result < 0))) {
+           debug(49, 5) ("snmp var_netdb_entry: yup, a match.\n");
+           break;
+       }
+       n = netdbGetNext(addr_table);
     }
 #endif
     if (n == NULL)
-        return NULL;
+       return NULL;
 
     debug(49, 5) ("hey, matched.\n");
     memcpy((char *) name, (char *) newname, ((int) vp->namelen + 1) * sizeof(oid));
     *length = vp->namelen + 1;
     *write_method = 0;
-    *var_len = sizeof(long);    /* default length */
+    *var_len = sizeof(long);   /* default length */
     sprint_objid(snbuf, newname, *length);
     debug(49, 5) ("snmp var_netdb_entry with peertable request for %s (%d)\n", snbuf, newname[10]);
 
     switch (vp->magic) {
     case NETDB_ID:
-       long_return= (long) cnt-1;
+       long_return = (long) cnt - 1;
        return (u_char *) & long_return;
     case NETDB_NET:
-        long_return = (long) n->network;
-        return (u_char *) & long_return;
+       long_return = (long) n->network;
+       return (u_char *) & long_return;
     case NETDB_PING_S:
-        long_return = (long) n->pings_sent;
-        return (u_char *) & long_return;
+       long_return = (long) n->pings_sent;
+       return (u_char *) & long_return;
     case NETDB_PING_R:
-        long_return = (long) n->pings_recv;
-        return (u_char *) & long_return;
+       long_return = (long) n->pings_recv;
+       return (u_char *) & long_return;
     case NETDB_HOPS:
-        long_return = (long) n->hops;
-        return (u_char *) & long_return;
+       long_return = (long) n->hops;
+       return (u_char *) & long_return;
     case NETDB_RTT:
-        long_return = (long) n->rtt;
-        return (u_char *) & long_return;
+       long_return = (long) n->rtt;
+       return (u_char *) & long_return;
     case NETDB_PINGTIME:
-        long_return = (long) n->next_ping_time;
-        return (u_char *) & long_return;
+       long_return = (long) n->next_ping_time;
+       return (u_char *) & long_return;
     case NETDB_LASTUSE:
-        long_return = (long) n->last_use_time;
-        return (u_char *) & long_return;
+       long_return = (long) n->last_use_time;
+       return (u_char *) & long_return;
     default:
-        return NULL;
+       return NULL;
     }
 }
 #endif

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index c4491e88e15ef56fba47b8899020654af5f7d69a..ac6d73b101aa13faaa60a730f8f15d2f1d65f95d 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -373,7 +373,7 @@ snmp_agent_parse(sn_data, length, out_sn_data, out_length, sourceip, ireqid)
            create_toobig(out_auth, *out_length, reqid, pi);
            break;
        }                       /* else FALLTHRU */
-#endif
+#lendif
     case SNMP_ERR_NOACCESS:
     case SNMP_ERR_WRONGTYPE:
     case SNMP_ERR_WRONGLENGTH:

diff --git a/src/store.cc b/src/store.cc
index cf11df08bc9026a4b544c672f981a2cae99d4d18..81438659ebd6b390a88ff5004407fcdbfe677bd3 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,5 +1,6 @@
+
 /*
- * $Id: store.cc,v 1.357 1997/12/07 07:18:03 wessels Exp $
+ * $Id: store.cc,v 1.358 1997/12/30 02:47:45 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived

diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc
index 0e2fd5496ab164c55c41d843204a46450acb9a8d..7bdc6417cad8e6bc208a4efa4a72866524d6f86f 100644 (file)
--- a/src/store_key_md5.cc
+++ b/src/store_key_md5.cc
@@ -22,11 +22,11 @@ storeKeyScan(const char *buf)
     int i;
     int j = 0;
     unsigned char t[3];
-    for (i=0; i<MD5_DIGEST_CHARS; i++) {
-       t[0] = *(buf+(j++));
-       t[1] = *(buf+(j++));
+    for (i = 0; i < MD5_DIGEST_CHARS; i++) {
+       t[0] = *(buf + (j++));
+       t[1] = *(buf + (j++));
        t[2] = '\0';
-       *(digest+i) = (unsigned char) strtol(t, NULL, 16);
+       *(digest + i) = (unsigned char) strtol(t, NULL, 16);
     }
     return digest;
 }
@@ -52,9 +52,9 @@ storeKeyHashHash(const void *key, unsigned int n)
     /* note, n must be a power of 2! */
     const unsigned char *digest = key;
     unsigned int i = digest[0]
-       | digest[1] << 8
-       | digest[2] <<16 
-       | digest[3] <<24;
+    | digest[1] << 8
+    | digest[2] << 16
+    | digest[3] << 24;
     return (i & (--n));
 }
 

diff --git a/src/structs.h b/src/structs.h
index 493d59851866b9af32d4eb7b7581c59dd5659bce..dd12e3ad09163c818cf6983fb8cbc778381a881b 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,5 +1,6 @@
 
 
+
 struct _acl_ip_data {
     struct in_addr addr1;      /* if addr2 non-zero then its a range */
     struct in_addr addr2;

diff --git a/src/urn.cc b/src/urn.cc
index aca9f9012919e6b8bf993359fcde46bc2b35a745..bd7a25dddb39c293b0a0cebe564ed6f6fc0bfa09 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -34,14 +34,14 @@ static wordlist *urnParseReply(const char *inbuf);
 static const char *const crlf = "\r\n";
 
 enum {
-       URN_FORCE_MENU
+    URN_FORCE_MENU
 };
 
 typedef struct {
-       StoreEntry *entry;
-       StoreEntry *urlres_e;
-       request_t *request;
-       int flags;
+    StoreEntry *entry;
+    StoreEntry *urlres_e;
+    request_t *request;
+    int flags;
 } UrnState;
 
 wordlist *
@@ -68,9 +68,9 @@ urnFindMinRtt(wordlist * urls, method_t m, int *rtt_ret)
        }
        debug(50, 3) ("%s rtt=%d\n", r->host, rtt);
        if (rtt == 0)
-               continue;
+           continue;
        if (rtt > min_rtt && min_rtt != 0)
-               continue;
+           continue;
        min_rtt = rtt;
        min_w = w;
        put_free_request_t(r);
@@ -84,7 +84,7 @@ urnFindMinRtt(wordlist * urls, method_t m, int *rtt_ret)
 }
 
 void
-urnStart(request_t *r, StoreEntry *e)
+urnStart(request_t * r, StoreEntry * e)
 {
     LOCAL_ARRAY(char, urlres, 4096);
     request_t *urlres_r = NULL;
@@ -106,9 +106,9 @@ urnStart(request_t *r, StoreEntry *e)
        xfree(t);
     }
     if ((t = strchr(r->urlpath, ':')) != NULL) {
-       *t = '\0';
-       host = xstrdup(r->urlpath);
-       *t = ':';
+       *t = '\0';
+       host = xstrdup(r->urlpath);
+       *t = ':';
     } else {
        host = xstrdup(r->urlpath);
     }
@@ -123,8 +123,8 @@ urnStart(request_t *r, StoreEntry *e)
        storeClientListAdd(urlres_e, urnState);
        protoDispatch(0, urlres_e, urlres_r);
     } else {
-        storeLockObject(urlres_e);
-        storeClientListAdd(urlres_e, urnState);
+       storeLockObject(urlres_e);
+       storeClientListAdd(urlres_e, urnState);
     }
     urnState->urlres_e = urlres_e;
     storeClientCopy(urlres_e,
@@ -151,8 +151,8 @@ urnHandleReply(void *data, char *buf, ssize_t size)
     int l;
     String *S;
     ErrorState *err;
-       double tmprtt;
-       StoreEntry *tmpentry;
+    double tmprtt;
+    StoreEntry *tmpentry;
 
     debug(50, 3) ("urnHandleReply: Called with size=%d.\n", size);
     if (urlres_e->store_status == STORE_ABORTED) {
@@ -198,15 +198,15 @@ urnHandleReply(void *data, char *buf, ssize_t size)
     while (isspace(*s))
        s++;
     urls = urnParseReply(s);
-    if (urls == NULL) {        /* unkown URN error */
+    if (urls == NULL) {                /* unkown URN error */
        debug(50, 3) ("urnTranslateDone: unknown URN %s\n", storeUrl(e));
        err = errorCon(ERR_URN_RESOLVE, HTTP_NOT_FOUND);
        err->request = requestLink(urnState->request);
        err->url = xstrdup(storeUrl(e));
        errorAppendEntry(e, err);
        return;
-    } 
-     min_w = urnFindMinRtt(urls, urnState->request->method, NULL);
+    }
+    min_w = urnFindMinRtt(urls, urnState->request->method, NULL);
     storeBuffer(e);
     S = stringCreate(1024);
     l = snprintf(line, 4096,
@@ -215,15 +215,15 @@ urnHandleReply(void *data, char *buf, ssize_t size)
        "<TABLE BORDER=0 WIDTH=\"100%%\">\n", storeUrl(e), storeUrl(e));
     stringAppend(S, line, l);
     for (w = urls; w; w = w->next) {
-       request_t *tmpr=urlParse(urnState->request->method, w->key);
-       const cache_key *tmpk=storeKeyPublic(w->key,urnState->request->method);
-       tmpentry=storeGet(tmpk);
-       if (tmpr && tmpr->host && (tmprtt=netdbHostRtt(tmpr->host)))
-         l= snprintf(line, 4096, "<TR><TD><A HREF=\"%s\">%s</A></TD><TD align=right>%4.0f </it>ms</it></TD><TD>%s</TD></TR>\n",
-                       w->key,w->key,tmprtt, tmpentry?"    [cached]":" " );
-       else 
-         l = snprintf(line, 4096, "<TR><TD><A HREF=\"%s\">%s</A></TD></TR>", w->key, w->key);
-        stringAppend(S, line, l);
+       request_t *tmpr = urlParse(urnState->request->method, w->key);
+       const cache_key *tmpk = storeKeyPublic(w->key, urnState->request->method);
+       tmpentry = storeGet(tmpk);
+       if (tmpr && tmpr->host && (tmprtt = netdbHostRtt(tmpr->host)))
+           l = snprintf(line, 4096, "<TR><TD><A HREF=\"%s\">%s</A></TD><TD align=right>%4.0f </it>ms</it></TD><TD>%s</TD></TR>\n",
+               w->key, w->key, tmprtt, tmpentry ? "    [cached]" : " ");
+       else
+           l = snprintf(line, 4096, "<TR><TD><A HREF=\"%s\">%s</A></TD></TR>", w->key, w->key);
+       stringAppend(S, line, l);
     }
     l = snprintf(line, 4096,
        "</TABLE>"
@@ -242,10 +242,10 @@ urnHandleReply(void *data, char *buf, ssize_t size)
     storeAppend(e, hdr, strlen(hdr));
     httpParseReplyHeaders(hdr, e->mem_obj->reply);
     if (EBIT_TEST(urnState->flags, URN_FORCE_MENU)) {
-       debug(51,3)("urnHandleReply: forcing menu\n");
+       debug(51, 3) ("urnHandleReply: forcing menu\n");
     } else if (min_w) {
        l = snprintf(line, 4096, "Location: %s\r\n", min_w->key);
-        storeAppend(e, line, l);
+       storeAppend(e, line, l);
     }
     storeAppend(e, "\r\n", 2);
     storeAppend(e, S->buf, stringLength(S));