From: wessels <> Date: Fri, 2 Jan 1998 09:05:59 +0000 (+0000) Subject: gindent X-Git-Tag: SQUID_3_0_PRE1~4299 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47130615adf48d144b123484de781277bc969ed5;p=thirdparty%2Fsquid.git gindent --- diff --git a/include/md5.h b/include/md5.h index e8387c05c3..9ede369630 100644 --- a/include/md5.h +++ b/include/md5.h @@ -38,4 +38,4 @@ void MD5Final(unsigned char[16], MD5_CTX *); #define MD5_DIGEST_CHARS 16 -#endif /* MD5_H */ +#endif /* MD5_H */ diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c index fecf64f9be..dac0ea2847 100644 --- a/snmplib/snmp_api.c +++ b/snmplib/snmp_api.c @@ -135,7 +135,7 @@ void sync_with_agent(); int parse_app_community_string(); void snmp_synch_setup(); int snmp_synch_response(); -void md5Digest(u_char *msg, int length, u_char *key, u_char *digest); +void md5Digest(u_char * msg, int length, u_char * key, u_char * digest); #if NO_PRINTFS static char * diff --git a/src/access_log.cc b/src/access_log.cc index 574ae8d230..6b6f9cc521 100644 --- a/src/access_log.cc +++ b/src/access_log.cc @@ -1,6 +1,7 @@ + /* - * $Id: access_log.cc,v 1.14 1997/12/03 01:28:17 wessels Exp $ + * $Id: access_log.cc,v 1.15 1998/01/02 02:06:01 wessels Exp $ * * DEBUG: section 46 Access Log * AUTHOR: Duane Wessels diff --git a/src/asn.cc b/src/asn.cc index 3ed5df9665..1f9e710c5a 100644 --- a/src/asn.cc +++ b/src/asn.cc @@ -108,7 +108,7 @@ asnMatchIp(void *data, struct in_addr addr) lh = ntohl(addr.s_addr); debug(53, 4) ("asnMatchIp: Called for %s.\n", inet_ntoa(addr)); - if (AS_tree_head == 0 || &addr==&no_addr) + if (AS_tree_head == 0 || &addr == &no_addr) return 0; store_m_int(lh, m_addr); rn = rn_match(m_addr, AS_tree_head); diff --git a/src/client.cc b/src/client.cc index 9f0e185a33..8ab7134ef4 100644 --- a/src/client.cc +++ b/src/client.cc @@ -1,8 +1,9 @@ + /* - * $Id: client.cc,v 1.46 1997/12/30 02:47:38 wessels Exp $ + * $Id: client.cc,v 1.47 1998/01/02 02:06:03 wessels Exp $ * * DEBUG: section 0 WWW Client * AUTHOR: Harvest Derived diff --git a/src/client_side.cc b/src/client_side.cc index 442cb7c1e5..d9bf4686ce 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1,6 +1,6 @@ /* - * $Id: client_side.cc,v 1.185 1998/01/01 19:29:17 wessels Exp $ + * $Id: client_side.cc,v 1.186 1998/01/02 02:06:03 wessels Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -1026,7 +1026,7 @@ clientWriteComplete(int fd, char *bufnotused, size_t size, int errflag, void *da * Set the timeout BEFORE calling clientReadRequest(). */ commSetTimeout(fd, 15, requestTimeout, conn); - clientReadRequest(fd, conn); /* Read next request */ + clientReadRequest(fd, conn); /* Read next request */ /* * Note, the FD may be closed at this point. */ @@ -1580,12 +1580,12 @@ clientReadRequest(int fd, void *data) debug(50, 2) ("clientReadRequest: FD %d: %s\n", fd, xstrerror()); comm_close(fd); return; - } else if(conn->in.offset == 0) { + } else if (conn->in.offset == 0) { debug(50, 2) ("clientReadRequest: FD %d: no data to process\n"); return; } /* Continue to process previously read data */ - size=0; + size = 0; } conn->in.offset += size; conn->in.buf[conn->in.offset] = '\0'; /* Terminate the string */ @@ -1596,7 +1596,7 @@ clientReadRequest(int fd, void *data) if (nrequests >= 2) { debug(12, 2) ("clientReadRequest: FD %d max concurrent requests reached\n", fd); debug(12, 5) ("clientReadRequest: FD %d defering new request until one is done\n", fd); - conn->defer.until = squid_curtime + 100; /* Reset when a request is complete */ + conn->defer.until = squid_curtime + 100; /* Reset when a request is complete */ break; } /* Process request */ @@ -1614,7 +1614,7 @@ clientReadRequest(int fd, void *data) * data to the beginning */ if (conn->in.offset > 0) - memmove(conn->in.buf, conn->in.buf + http->req_sz, conn->in.size); + memmove(conn->in.buf, conn->in.buf + http->req_sz, conn->in.size); /* add to the client request queue */ for (H = &conn->chr; *H; H = &(*H)->next); *H = http; diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc index c4491e88e1..ac6d73b101 100644 --- 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/structs.h b/src/structs.h index dd12e3ad09..34a838ef1f 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1,6 +1,7 @@ + struct _acl_ip_data { struct in_addr addr1; /* if addr2 non-zero then its a range */ struct in_addr addr2; diff --git a/test-suite/pconn-banger.c b/test-suite/pconn-banger.c index 3f1b56fd1c..b3d3aa88e6 100644 --- a/test-suite/pconn-banger.c +++ b/test-suite/pconn-banger.c @@ -1,3 +1,4 @@ + #include "config.h" /* diff --git a/test-suite/tcp-banger2.c b/test-suite/tcp-banger2.c index 2e4639fbab..034ff3ea3c 100644 --- a/test-suite/tcp-banger2.c +++ b/test-suite/tcp-banger2.c @@ -292,7 +292,7 @@ main(argc, argv) FD_SET(i, &R); } if (select(maxfd + 1, &R, NULL, NULL, &to) < 0) { - printf("maxfd=%d\n", maxfd); + printf("maxfd=%d\n", maxfd); if (errno != EINTR) perror("select"); continue;