From 6a54c60e337ef597f43ebd57611a54fff4cb4eaa Mon Sep 17 00:00:00 2001 From: wessels <> Date: Tue, 21 Oct 1997 04:59:41 +0000 Subject: [PATCH] gindent --- lib/snprintf.c | 126 +++++++++++++++++---------------------- lib/util.c | 4 +- src/client.cc | 3 +- src/client_side.cc | 6 +- src/disk.cc | 19 +++--- src/errorpage.cc | 6 +- src/main.cc | 32 +++++----- src/store.cc | 16 ++--- src/structs.h | 4 +- test-suite/tcp-banger2.c | 91 ++++++++++++++-------------- 10 files changed, 146 insertions(+), 161 deletions(-) diff --git a/lib/snprintf.c b/lib/snprintf.c index f3245a6e66..1d854e3e2d 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -66,9 +66,9 @@ #ifdef HAVE_CVT -# define ap_ecvt ecvt -# define ap_fcvt fcvt -# define ap_gcvt gcvt +#define ap_ecvt ecvt +#define ap_fcvt fcvt +#define ap_gcvt gcvt #else @@ -87,7 +87,7 @@ #define NDIG 80 static char * - ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag) +ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag) { register int r2; double fi, fj; @@ -117,8 +117,7 @@ static char * } while (p1 < &buf[NDIG]) *p++ = *p1++; - } - else if (arg > 0) { + } else if (arg > 0) { while ((fj = arg * 10) < 1) { arg = fj; r2--; @@ -162,13 +161,13 @@ static char * } static char * - ap_ecvt(double arg, int ndigits, int *decpt, int *sign) +ap_ecvt(double arg, int ndigits, int *decpt, int *sign) { return (ap_cvt(arg, ndigits, decpt, sign, 1)); } static char * - ap_fcvt(double arg, int ndigits, int *decpt, int *sign) +ap_fcvt(double arg, int ndigits, int *decpt, int *sign) { return (ap_cvt(arg, ndigits, decpt, sign, 0)); } @@ -179,7 +178,7 @@ static char * */ static char * - ap_gcvt(double number, int ndigit, char *buf) +ap_gcvt(double number, int ndigit, char *buf) { int sign, decpt; register char *p1, *p2; @@ -202,16 +201,14 @@ static char * if (decpt < 0) { decpt = -decpt; *p2++ = '-'; - } - else + } else *p2++ = '+'; if (decpt / 100 > 0) *p2++ = decpt / 100 + '0'; if (decpt / 10 > 0) *p2++ = (decpt % 100) / 10 + '0'; *p2++ = decpt % 10 + '0'; - } - else { + } else { if (decpt <= 0) { if (*p1 != '0') *p2++ = '.'; @@ -249,9 +246,9 @@ typedef enum { #define INT_NULL ((int *)0) #define WIDE_INT long -typedef WIDE_INT wide_int; -typedef unsigned WIDE_INT u_wide_int; -typedef int bool_int; +typedef WIDE_INT wide_int; +typedef unsigned WIDE_INT u_wide_int; +typedef int bool_int; #define S_NULL "(null)" #define S_NULL_LEN 6 @@ -352,8 +349,8 @@ typedef struct buf_area buffy; * is declared as buf[ 100 ], buf_end should be &buf[ 100 ]) */ static char * - conv_10(register wide_int num, register bool_int is_unsigned, - register bool_int * is_negative, char *buf_end, register int *len) +conv_10(register wide_int num, register bool_int is_unsigned, + register bool_int * is_negative, char *buf_end, register int *len) { register char *p = buf_end; register u_wide_int magnitude; @@ -361,8 +358,7 @@ static char * if (is_unsigned) { magnitude = (u_wide_int) num; *is_negative = FALSE; - } - else { + } else { *is_negative = (num < 0); /* @@ -378,8 +374,7 @@ static char * wide_int t = num + 1; magnitude = ((u_wide_int) - t) + 1; - } - else + } else magnitude = (u_wide_int) num; } @@ -389,7 +384,7 @@ static char * do { register u_wide_int new_magnitude = magnitude / 10; - *--p = (char)(magnitude - new_magnitude * 10 + '0'); + *--p = (char) (magnitude - new_magnitude * 10 + '0'); magnitude = new_magnitude; } while (magnitude); @@ -407,8 +402,8 @@ static char * * in buf). */ static char * - conv_fp(register char format, register double num, -boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) +conv_fp(register char format, register double num, + boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) { register char *s = buf; register char *p; @@ -427,7 +422,6 @@ boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) *is_negative = FALSE; return (buf); } - if (format == 'f') if (decimal_point <= 0) { *s++ = '0'; @@ -435,17 +429,14 @@ boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) *s++ = '.'; while (decimal_point++ < 0) *s++ = '0'; - } - else if (add_dp) + } else if (add_dp) *s++ = '.'; - } - else { + } else { while (decimal_point-- > 0) *s++ = *p++; if (precision > 0 || add_dp) *s++ = '.'; - } - else { + } else { *s++ = *p++; if (precision > 0 || add_dp) *s++ = '.'; @@ -466,7 +457,7 @@ boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) decimal_point--; if (decimal_point != 0) { p = conv_10((wide_int) decimal_point, FALSE, &exponent_is_negative, - &temp[EXPONENT_LENGTH], &t_len); + &temp[EXPONENT_LENGTH], &t_len); *s++ = exponent_is_negative ? '-' : '+'; /* @@ -476,14 +467,12 @@ boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) *s++ = '0'; while (t_len--) *s++ = *p++; - } - else { + } else { *s++ = '+'; *s++ = '0'; *s++ = '0'; } } - *len = s - buf; return (buf); } @@ -500,8 +489,8 @@ boolean_e add_dp, int precision, bool_int * is_negative, char *buf, int *len) * is declared as buf[ 100 ], buf_end should be &buf[ 100 ]) */ static char * - conv_p2(register u_wide_int num, register int nbits, - char format, char *buf_end, register int *len) +conv_p2(register u_wide_int num, register int nbits, + char format, char *buf_end, register int *len) { register int mask = (1 << nbits) - 1; register char *p = buf_end; @@ -523,8 +512,9 @@ static char * /* * Do format conversion placing the output in buffer */ -static int format_converter(register buffy * odp, const char *fmt, - va_list ap) +static int +format_converter(register buffy * odp, const char *fmt, + va_list ap) { register char *sp; register char *bep; @@ -567,8 +557,7 @@ static int format_converter(register buffy * odp, const char *fmt, while (*fmt) { if (*fmt != '%') { INS_CHAR(*fmt, sp, bep, cc); - } - else { + } else { /* * Default variable settings */ @@ -607,8 +596,7 @@ static int format_converter(register buffy * odp, const char *fmt, if (isdigit(*fmt)) { STR_TO_DEC(fmt, min_width); adjust_width = YES; - } - else if (*fmt == '*') { + } else if (*fmt == '*') { min_width = va_arg(ap, int); fmt++; adjust_width = YES; @@ -616,8 +604,7 @@ static int format_converter(register buffy * odp, const char *fmt, adjust = LEFT; min_width = -min_width; } - } - else + } else adjust_width = NO; /* @@ -632,20 +619,16 @@ static int format_converter(register buffy * odp, const char *fmt, fmt++; if (isdigit(*fmt)) { STR_TO_DEC(fmt, precision); - } - else if (*fmt == '*') { + } else if (*fmt == '*') { precision = va_arg(ap, int); fmt++; if (precision < 0) precision = 0; - } - else + } else precision = 0; - } - else + } else adjust_precision = NO; - } - else + } else adjust_precision = adjust_width = NO; /* @@ -654,8 +637,7 @@ static int format_converter(register buffy * odp, const char *fmt, if (*fmt == 'l') { is_long = YES; fmt++; - } - else + } else is_long = NO; /* @@ -691,7 +673,7 @@ static int format_converter(register buffy * odp, const char *fmt, i_num = (wide_int) va_arg(ap, int); }; s = conv_10(i_num, (*fmt) == 'u', &is_negative, - &num_buf[NUM_BUF_SIZE], &s_len); + &num_buf[NUM_BUF_SIZE], &s_len); FIX_PRECISION(adjust_precision, precision, s, s_len); if (*fmt != 'u') { @@ -711,7 +693,7 @@ static int format_converter(register buffy * odp, const char *fmt, else ui_num = (u_wide_int) va_arg(ap, unsigned int); s = conv_p2(ui_num, 3, *fmt, - &num_buf[NUM_BUF_SIZE], &s_len); + &num_buf[NUM_BUF_SIZE], &s_len); FIX_PRECISION(adjust_precision, precision, s, s_len); if (alternate_form && *s != '0') { *--s = '0'; @@ -727,7 +709,7 @@ static int format_converter(register buffy * odp, const char *fmt, else ui_num = (u_wide_int) va_arg(ap, unsigned int); s = conv_p2(ui_num, 4, *fmt, - &num_buf[NUM_BUF_SIZE], &s_len); + &num_buf[NUM_BUF_SIZE], &s_len); FIX_PRECISION(adjust_precision, precision, s, s_len); if (alternate_form && i_num != 0) { *--s = *fmt; /* 'x' or 'X' */ @@ -743,8 +725,7 @@ static int format_converter(register buffy * odp, const char *fmt, s_len = strlen(s); if (adjust_precision && precision < s_len) s_len = precision; - } - else { + } else { s = S_NULL; s_len = S_NULL_LEN; } @@ -758,8 +739,8 @@ static int format_converter(register buffy * odp, const char *fmt, fp_num = va_arg(ap, double); s = conv_fp(*fmt, fp_num, alternate_form, - (adjust_precision == NO) ? FLOAT_DIGITS : precision, - &is_negative, &num_buf[1], &s_len); + (adjust_precision == NO) ? FLOAT_DIGITS : precision, + &is_negative, &num_buf[1], &s_len); if (is_negative) prefix_char = '-'; else if (print_sign) @@ -828,7 +809,7 @@ static int format_converter(register buffy * odp, const char *fmt, if (sizeof(char *) <= sizeof(u_wide_int)) s = conv_p2(ui_num, 4, 'x', - &num_buf[NUM_BUF_SIZE], &s_len); + &num_buf[NUM_BUF_SIZE], &s_len); else { s = "%p"; s_len = 2; @@ -868,7 +849,6 @@ static int format_converter(register buffy * odp, const char *fmt, *--s = prefix_char; s_len++; } - if (adjust_width && adjust == RIGHT && min_width > s_len) { if (pad_char == '0' && prefix_char != NUL) { INS_CHAR(*s, sp, bep, cc) @@ -878,7 +858,6 @@ static int format_converter(register buffy * odp, const char *fmt, } PAD(min_width, s_len, pad_char); } - /* * Print the string s. */ @@ -900,8 +879,9 @@ static int format_converter(register buffy * odp, const char *fmt, /* * This is the general purpose conversion function. */ -static void strx_printv(int *ccp, char *buf, size_t len, const char *format, - va_list ap) +static void +strx_printv(int *ccp, char *buf, size_t len, const char *format, + va_list ap) { buffy od; int cc; @@ -925,7 +905,8 @@ static void strx_printv(int *ccp, char *buf, size_t len, const char *format, } -int snprintf(char *buf, size_t len, const char *format,...) +int +snprintf(char *buf, size_t len, const char *format,...) { int cc; va_list ap; @@ -937,8 +918,9 @@ int snprintf(char *buf, size_t len, const char *format,...) } -int vsnprintf(char *buf, size_t len, const char *format, - va_list ap) +int +vsnprintf(char *buf, size_t len, const char *format, + va_list ap) { int cc; @@ -946,4 +928,4 @@ int vsnprintf(char *buf, size_t len, const char *format, return (cc); } -#endif /* HAVE_SNPRINTF */ +#endif /* HAVE_SNPRINTF */ diff --git a/lib/util.c b/lib/util.c index 83724d5a06..08d615d219 100644 --- a/lib/util.c +++ b/lib/util.c @@ -1,5 +1,5 @@ /* - * $Id: util.c,v 1.32 1997/10/17 05:27:56 wessels Exp $ + * $Id: util.c,v 1.33 1997/10/20 22:59:42 wessels Exp $ * * DEBUG: * AUTHOR: Harvest Derived @@ -453,7 +453,7 @@ xbstrerror(int err) { static char xbstrerror_buf[BUFSIZ]; if (err < 0 || err >= sys_nerr) - return ("Unknown"); + return ("Unknown"); sprintf(xbstrerror_buf, "(%d) %s", err, strerror(err)); return xbstrerror_buf; } diff --git a/src/client.cc b/src/client.cc index ecab1ba050..06a68203a8 100644 --- a/src/client.cc +++ b/src/client.cc @@ -1,8 +1,9 @@ + /* - * $Id: client.cc,v 1.31 1997/10/17 00:00:31 wessels Exp $ + * $Id: client.cc,v 1.32 1997/10/20 22:59:43 wessels Exp $ * * DEBUG: section 0 WWW Client * AUTHOR: Harvest Derived diff --git a/src/client_side.cc b/src/client_side.cc index 4811c21a74..848d37817e 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1,6 +1,6 @@ /* - * $Id: client_side.cc,v 1.128 1997/10/17 23:31:10 wessels Exp $ + * $Id: client_side.cc,v 1.129 1997/10/20 22:59:43 wessels Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -280,8 +280,8 @@ icpHandleIMSReply(void *data, char *buf, ssize_t size) } http->old_entry = NULL; /* done with old_entry */ /* use clientCacheHit() here as the callback because we might - be swapping in from disk, and the file might not really be - there */ + * be swapping in from disk, and the file might not really be + * there */ storeClientCopy(entry, http->out.offset, http->out.offset, diff --git a/src/disk.cc b/src/disk.cc index ec48f0374d..e4a5800f3b 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -1,5 +1,5 @@ /* - * $Id: disk.cc,v 1.81 1997/10/17 20:20:17 wessels Exp $ + * $Id: disk.cc,v 1.82 1997/10/20 22:59:44 wessels Exp $ * * DEBUG: section 6 Disk I/O Routines * AUTHOR: Harvest Derived @@ -130,6 +130,7 @@ typedef struct _dwalk_ctrl { FILE_WALK_LHD *line_handler; void *line_data; } dwalk_ctrl; + #endif static AIOCB diskHandleWriteComplete; @@ -420,8 +421,8 @@ diskHandleRead(int fd, void *data) ctrlp); #else if (F->disk.offset != ctrl_dat->offset) { - debug(6,1)("diskHandleRead: seeking to offset %d\n", - (int) ctrl_dat->offset); + debug(6, 1) ("diskHandleRead: seeking to offset %d\n", + (int) ctrl_dat->offset); lseek(fd, ctrl_dat->offset, SEEK_SET); /* XXX ignore return? */ } len = read(fd, ctrl_dat->buf, ctrl_dat->req_len); @@ -469,12 +470,12 @@ diskHandleReadComplete(void *data, int len, int errcode) safe_free(ctrl_dat); return; } - ctrl_dat->handler(fd, - ctrl_dat->buf, - len, - DISK_OK, - ctrl_dat->client_data); - safe_free(ctrl_dat); + ctrl_dat->handler(fd, + ctrl_dat->buf, + len, + DISK_OK, + ctrl_dat->client_data); + safe_free(ctrl_dat); } diff --git a/src/errorpage.cc b/src/errorpage.cc index 28cba4b534..2b37e88e92 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -1,6 +1,6 @@ /* - * $Id: errorpage.cc,v 1.78 1997/10/20 19:06:25 wessels Exp $ + * $Id: errorpage.cc,v 1.79 1997/10/20 22:59:45 wessels Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels @@ -226,7 +226,7 @@ errorSend(int fd, ErrorState * err) { char *buf; int len; - debug(4,3)("errorSend: FD %d, err=%p\n", fd, err); + debug(4, 3) ("errorSend: FD %d, err=%p\n", fd, err); assert(fd >= 0); buf = errorBuildBuf(err, &len); cbdataAdd(err); @@ -251,7 +251,7 @@ static void errorSendComplete(int fd, char *buf, int size, int errflag, void *data) { ErrorState *err = data; - debug(4,3)("errorSendComplete: FD %d, size=%d\n", fd, size); + debug(4, 3) ("errorSendComplete: FD %d, size=%d\n", fd, size); if (err->callback) err->callback(fd, err->callback_data, size); cbdataUnlock(err); diff --git a/src/main.cc b/src/main.cc index 7a6571026c..8306cc7f71 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,6 @@ /* - * $Id: main.cc,v 1.174 1997/10/20 22:31:36 kostas Exp $ + * $Id: main.cc,v 1.175 1997/10/20 22:59:47 wessels Exp $ * * DEBUG: section 1 Startup and Main Loop * AUTHOR: Harvest Derived @@ -389,21 +389,21 @@ serverConnectionsOpen(void) } } #ifdef SQUID_SNMP - if (Config.Port.snmp) { - enter_suid(); - fd = comm_open(SOCK_STREAM, - 0, - Config.Addrs.snmp_incoming, - SQUID_SNMP_PORT, - COMM_NONBLOCKING, - "SNMP Socket"); - leave_suid(); - if (fd < 0) - continue; - comm_listen(fd); - commSetSelect(fd, COMM_SELECT_READ, snmpAccept, NULL, 0); - debug(1, 1) ("Accepting SNMP connections on port %d, FD %d.\n", - (int) SQUID_SNMP_PORT , fd); + if (Config.Port.snmp) { + enter_suid(); + fd = comm_open(SOCK_STREAM, + 0, + Config.Addrs.snmp_incoming, + SQUID_SNMP_PORT, + COMM_NONBLOCKING, + "SNMP Socket"); + leave_suid(); + if (fd < 0) + continue; + comm_listen(fd); + commSetSelect(fd, COMM_SELECT_READ, snmpAccept, NULL, 0); + debug(1, 1) ("Accepting SNMP connections on port %d, FD %d.\n", + (int) SQUID_SNMP_PORT, fd); } #endif /* SQUID_SNMP */ diff --git a/src/store.cc b/src/store.cc index f84d530ec9..0fd31edf58 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.297 1997/10/20 22:49:25 wessels Exp $ + * $Id: store.cc,v 1.298 1997/10/20 22:59:48 wessels Exp $ * * DEBUG: section 20 Storeage Manager * AUTHOR: Harvest Derived @@ -759,7 +759,7 @@ storeUnregister(StoreEntry * e, void *data) if (sc == NULL) return 0; if (e->store_status == STORE_OK && e->swap_status != SWAPOUT_DONE) - storeCheckSwapOut(e); + storeCheckSwapOut(e); sc->seen_offset = 0; sc->copy_offset = 0; if (sc->swapin_fd > -1) @@ -922,9 +922,9 @@ storeSwapOutHandle(int fd, int flag, size_t len, void *data) if (!storeCheckCachable(e)) { storeReleaseRequest(e); } else { - e->swap_status = SWAPOUT_DONE; - storeLog(STORE_LOG_SWAPOUT, e); - storeDirSwapLog(e); + e->swap_status = SWAPOUT_DONE; + storeLog(STORE_LOG_SWAPOUT, e); + storeDirSwapLog(e); } HTTPCacheInfo->proto_newobject(HTTPCacheInfo, mem->request->protocol, @@ -982,9 +982,9 @@ storeCheckSwapOut(StoreEntry * e) if (e->swap_status == SWAPOUT_NONE) { assert(mem->swapout.fd == -1); if (storeCheckCachable(e)) - storeSwapOutStart(e); + storeSwapOutStart(e); /* else ENTRY_CACHABLE will be cleared and we'll never get - here again */ + * here again */ return; } if (e->swap_status == SWAPOUT_OPENING) @@ -2015,7 +2015,7 @@ storeClientCopyHandleRead(int fd, const char *buf, int len, int flag, void *data MemObject *mem = sc->mem; debug(20, 3) ("storeClientCopyHandleRead: FD %d, len %d\n", fd, len); if (len > 0 && sc->copy_offset == 0) - httpParseReplyHeaders(buf, mem->reply); + httpParseReplyHeaders(buf, mem->reply); sc->callback(sc->callback_data, sc->copy_buf, len); } diff --git a/src/structs.h b/src/structs.h index ff11c9bdc2..08a5741830 100644 --- a/src/structs.h +++ b/src/structs.h @@ -173,7 +173,7 @@ struct _SquidConfig { struct in_addr udp_incoming; #ifdef SQUID_SNMP struct in_addr snmp_incoming; -#endif /* SQUID_SNMP */ +#endif /* SQUID_SNMP */ struct in_addr udp_outgoing; struct in_addr client_netmask; } Addrs; @@ -734,7 +734,7 @@ struct _store_client { char *copy_buf; STCB *callback; void *callback_data; - MemObject *mem; /* ptr to the parent structure, argh! */ + MemObject *mem; /* ptr to the parent structure, argh! */ short swapin_fd; }; diff --git a/test-suite/tcp-banger2.c b/test-suite/tcp-banger2.c index b8661df39e..eaba314474 100644 --- a/test-suite/tcp-banger2.c +++ b/test-suite/tcp-banger2.c @@ -1,3 +1,4 @@ + #define FD_SETSIZE 1024 #include @@ -43,7 +44,7 @@ int maxfd = 0; char * mkrfc850(t) - time_t *t; + time_t *t; { static char buf[128]; struct tm *gmt = gmtime(t); @@ -61,13 +62,13 @@ fd_close(int fd) nfds--; if (fd == maxfd) { while (FD[fd].cb == NULL) - fd--; + fd--; maxfd = fd; } } void -fd_open(int fd, CB *cb, void *data) +fd_open(int fd, CB * cb, void *data) { FD[fd].cb = cb; FD[fd].data = data; @@ -79,25 +80,25 @@ fd_open(int fd, CB *cb, void *data) void sig_intr(int sig) { - fd_close(0); - printf ("\rWaiting for open connections to finish...\n"); - signal(sig, SIG_DFL); + fd_close(0); + printf("\rWaiting for open connections to finish...\n"); + signal(sig, SIG_DFL); } -void +void read_reply(int fd, void *data) { - static char buf[READ_BUF_SZ]; - if (read(fd, buf, READ_BUF_SZ) <= 0) { - fd_close(fd); - reqpersec++; - nrequests++; - } + static char buf[READ_BUF_SZ]; + if (read(fd, buf, READ_BUF_SZ) <= 0) { + fd_close(fd); + reqpersec++; + nrequests++; + } } int request(url) - char *url; + char *url; { int s; char buf[4096]; @@ -112,7 +113,7 @@ request(url) S.sin_family = AF_INET; S.sin_port = htons(proxy_port); S.sin_addr.s_addr = inet_addr(proxy_addr); - if (connect(s, (struct sockaddr *) & S, sizeof(S)) < 0) { + if (connect(s, (struct sockaddr *) &S, sizeof(S)) < 0) { close(s); perror("connect"); return -1; @@ -136,9 +137,9 @@ request(url) return -1; } /* - if (fcntl(s, F_SETFL, O_NDELAY) < 0) - perror("fcntl O_NDELAY"); -*/ + * if (fcntl(s, F_SETFL, O_NDELAY) < 0) + * perror("fcntl O_NDELAY"); + */ return s; } @@ -157,7 +158,7 @@ read_url(int fd, void *junk) *t = '\0'; s = request(buf); if (s < 0) { - max_connections = nfds-1; + max_connections = nfds - 1; printf("NOTE: max_connections set at %d\n", max_connections); } fd_open(s, read_reply, NULL); @@ -166,13 +167,13 @@ read_url(int fd, void *junk) void usage(void) { - fprintf(stderr, "usage: %s: -p port -h host -n max\n", progname); + fprintf(stderr, "usage: %s: -p port -h host -n max\n", progname); } -int +int main(argc, argv) - int argc; - char *argv[]; + int argc; + char *argv[]; { int i; int c; @@ -188,23 +189,23 @@ main(argc, argv) gettimeofday(&start, NULL); last = start; while ((c = getopt(argc, argv, "p:h:n:i")) != -1) { - switch (c) { + switch (c) { case 'p': - proxy_port = atoi(optarg); - break; + proxy_port = atoi(optarg); + break; case 'h': - proxy_addr = strdup(optarg); - break; + proxy_addr = strdup(optarg); + break; case 'n': - max_connections = atoi(optarg); - break; + max_connections = atoi(optarg); + break; case 'i': - opt_ims = 1; - break; + opt_ims = 1; + break; default: - usage(); - return 1; - } + usage(); + return 1; + } } fd_open(0, read_url, NULL); signal(SIGINT, sig_intr); @@ -221,7 +222,7 @@ main(argc, argv) } if (select(maxfd + 1, &R, NULL, NULL, &to) < 0) { if (errno != EINTR) - perror("select"); + perror("select"); continue; } for (i = 0; i <= maxfd; i++) { @@ -231,15 +232,15 @@ main(argc, argv) } gettimeofday(&now, NULL); if (now.tv_sec > last.tv_sec) { - last = now; - dt = (int) (now.tv_sec - start.tv_sec); - printf ("T+ %6d: %9d req (%+4d), %4d conn, %3d/sec avg\n", - dt, - nrequests, - reqpersec, - nfds, - (int) (nrequests / dt)); - reqpersec = 0; + last = now; + dt = (int) (now.tv_sec - start.tv_sec); + printf("T+ %6d: %9d req (%+4d), %4d conn, %3d/sec avg\n", + dt, + nrequests, + reqpersec, + nfds, + (int) (nrequests / dt)); + reqpersec = 0; } } return 0; -- 2.39.2