From: wessels <> Date: Tue, 16 Apr 1996 04:50:41 +0000 (+0000) Subject: gindent X-Git-Tag: SQUID_3_0_PRE1~6169 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0bbd6c8230f1c745d48ac9d4cc632d6f500bc8a;p=thirdparty%2Fsquid.git gindent --- diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 9f52512010..48db5db7e8 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -1,4 +1,4 @@ -/* $Id: cache_cf.cc,v 1.39 1996/04/15 19:20:23 wessels Exp $ */ +/* $Id: cache_cf.cc,v 1.40 1996/04/15 22:50:41 wessels Exp $ */ /* DEBUG: Section 3 cache_cf: Configuration file parsing */ @@ -428,9 +428,9 @@ static void parseCacheHostLine() if (!strcasecmp(token, "proxy-only")) { proxy_only = 1; } else if (!strcasecmp(token, "weight=")) { - weight = atoi(token+7); + weight = atoi(token + 7); } else { - self_destruct(); + self_destruct(); } } neighbors_cf_add(hostname, type, ascii_port, udp_port, proxy_only, weight); diff --git a/src/debug.cc b/src/debug.cc index 102b3abdd6..44d12fc01a 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -1,5 +1,5 @@ -/* $Id: debug.cc,v 1.14 1996/04/15 18:01:19 wessels Exp $ */ +/* $Id: debug.cc,v 1.15 1996/04/15 22:51:20 wessels Exp $ */ #include "squid.h" @@ -113,7 +113,7 @@ static void debugOpenLog(logfile) xfree(debug_log_file); debug_log_file = xstrdup(logfile); /* keep a static copy */ if (debug_log) - fclose(debug_log); + fclose(debug_log); debug_log = fopen(logfile, "a+"); if (!debug_log) { fprintf(stderr, "WARNING: Cannot write log file: %s\n", logfile); diff --git a/src/neighbors.cc b/src/neighbors.cc index 389f7c034a..8ad856ecb9 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -1,4 +1,4 @@ -/* $Id: neighbors.cc,v 1.18 1996/04/15 19:20:25 wessels Exp $ */ +/* $Id: neighbors.cc,v 1.19 1996/04/15 22:53:46 wessels Exp $ */ /* TODO: * - change 'neighbor' to 'sibling' @@ -594,7 +594,6 @@ void neighborsUdpAck(fd, url, header, from, entry) m->w_rtt = w_rtt; } } - if (m->e_pings_n_acks == m->e_pings_n_pings) { BIT_SET(entry->flag, ENTRY_DISPATCHED); entry->ping_status = DONE; @@ -616,7 +615,7 @@ void neighbors_cf_add(host, type, ascii_port, udp_port, proxy_only, weight) int ascii_port; int udp_port; int proxy_only; - int weight; + int weight; { struct neighbor_cf *t, *u; diff --git a/src/tools.cc b/src/tools.cc index 8d1a261afa..7eb19cbf03 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -1,5 +1,5 @@ -/* $Id: tools.cc,v 1.32 1996/04/15 19:20:27 wessels Exp $ */ +/* $Id: tools.cc,v 1.33 1996/04/15 22:54:55 wessels Exp $ */ /* * DEBUG: Section 21 tools @@ -170,10 +170,10 @@ void shut_down(sig) debug(21, 1, "Preparing for shutdown...\n"); serverConnectionsClose(); ipcacheShutdownServers(); - for(i=fdstat_biggest_fd(); i >= 0; i--) { + for (i = fdstat_biggest_fd(); i >= 0; i--) { f = &fd_table[i]; if (f->read_handler || f->write_handler || f->except_handler) - comm_set_fd_lifetime(i, 30); + comm_set_fd_lifetime(i, 30); } shutdown_pending = 1; /* reinstall signal handler? */ @@ -419,10 +419,10 @@ void reconfigure(sig) #endif } -int tvSubMsec (t1, t2) - struct timeval t1; - struct timeval t2; +int tvSubMsec(t1, t2) + struct timeval t1; + struct timeval t2; { return (t2.tv_sec - t1.tv_sec) * 1000 + - (t2.tv_usec - t1.tv_usec) / 1000; + (t2.tv_usec - t1.tv_usec) / 1000; }