From: wessels <> Date: Sat, 6 Apr 1996 00:48:27 +0000 (+0000) Subject: gindent X-Git-Tag: SQUID_3_0_PRE1~6272 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2318883b4e10e5bd523f5f676e3caef753dff724;p=thirdparty%2Fsquid.git gindent --- diff --git a/src/comm.cc b/src/comm.cc index f6c474f54f..625efa0dc1 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1,5 +1,5 @@ -/* $Id: comm.cc,v 1.15 1996/04/05 17:47:39 wessels Exp $ */ +/* $Id: comm.cc,v 1.16 1996/04/05 17:48:27 wessels Exp $ */ /* DEBUG: Section 5 comm: socket level functions */ @@ -702,7 +702,7 @@ int comm_set_select_handler(fd, type, handler, client_data) unsigned int type; /* 01 - read; 10 - write; 100 - except; 1000 - timeout ; 10000 - lifetime */ int (*handler) (); - void * client_data; + void *client_data; { return (comm_set_select_handler_plus_timeout(fd, type, handler, client_data, 0)); @@ -714,7 +714,7 @@ int comm_set_select_handler_plus_timeout(fd, type, handler, client_data, timeout unsigned int type; /* 01 - read; 10 - write; 100 - except; 1000 - timeout ; 10000 - lifetime */ int (*handler) (); - void * client_data; + void *client_data; time_t timeout; { if (type & COMM_SELECT_TIMEOUT) { diff --git a/src/disk.cc b/src/disk.cc index 91319f3963..c68bcd18cd 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -1,4 +1,4 @@ -/* $Id: disk.cc,v 1.8 1996/04/05 17:47:41 wessels Exp $ */ +/* $Id: disk.cc,v 1.9 1996/04/05 17:48:28 wessels Exp $ */ /* DEBUG: Section 6 disk: disk I/O routines */ @@ -14,9 +14,9 @@ typedef struct _dread_ctrl { char *buf; int cur_len; int end_of_file; - int (*handler) _PARAMS((int fd, char *buf, int size, int errflag, void * data, + int (*handler) _PARAMS((int fd, char *buf, int size, int errflag, void *data, int offset)); - void * client_data; + void *client_data; } dread_ctrl; typedef struct _dwalk_ctrl { @@ -24,10 +24,10 @@ typedef struct _dwalk_ctrl { off_t offset; char *buf; /* line buffer */ int cur_len; /* line len */ - int (*handler) _PARAMS((int fd, int errflag, void * data)); - void * client_data; - int (*line_handler) _PARAMS((int fd, char *buf, int size, void * line_data)); - void * line_data; + int (*handler) _PARAMS((int fd, int errflag, void *data)); + void *client_data; + int (*line_handler) _PARAMS((int fd, char *buf, int size, void *line_data)); + void *line_data; } dwalk_ctrl; typedef struct _dwrite_q { @@ -393,7 +393,7 @@ int diskHandleWrite(fd, entry) /* call a handle when writing is complete. */ int file_write(fd, ptr_to_buf, len, access_code, handle, handle_data) int fd; - char* ptr_to_buf; + char *ptr_to_buf; int len; int access_code; void (*handle) (); @@ -434,7 +434,7 @@ int file_write(fd, ptr_to_buf, len, access_code, handle, handle_data) if (file_table[fd].write_daemon == NOT_PRESENT) { /* got to start write routine for this fd */ comm_set_select_handler(fd, COMM_SELECT_WRITE, (PF) diskHandleWrite, - (void *) & file_table[fd]); + (void *) &file_table[fd]); } return DISK_OK; } @@ -507,7 +507,7 @@ int file_read(fd, buf, req_len, offset, handler, client_data) int req_len; int offset; FILE_READ_HD handler; - void * client_data; + void *client_data; { dread_ctrl *ctrl_dat; @@ -602,9 +602,9 @@ int diskHandleWalk(fd, walk_dat) int file_walk(fd, handler, client_data, line_handler, line_data) int fd; FILE_WALK_HD handler; - void * client_data; + void *client_data; FILE_WALK_LHD line_handler; - void * line_data; + void *line_data; { dwalk_ctrl *walk_dat; diff --git a/src/ipcache.cc b/src/ipcache.cc index 76424a45cd..4a6d8862fb 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -1,4 +1,4 @@ -/* $Id: ipcache.cc,v 1.13 1996/04/05 17:47:45 wessels Exp $ */ +/* $Id: ipcache.cc,v 1.14 1996/04/05 17:48:31 wessels Exp $ */ /* * DEBUG: Section 14 ipcache: IP Cache @@ -25,7 +25,7 @@ long ipcache_high = 200; typedef struct _ip_pending { int fd; IPH handler; - void * data; + void *data; struct _ip_pending *next; } IpPending; @@ -551,7 +551,7 @@ void ipcache_call_pending(entry) void ipcache_call_pending_badname(fd, handler, data) int fd; IPH handler; - void * data; + void *data; { debug(14, 4, "ipcache_call_pending_badname: Bad Name: Calling handler with NULL result.\n"); handler(fd, NULL, data); @@ -937,7 +937,7 @@ int ipcache_nbgethostbyname(name, fd, handler, data) char *name; int fd; IPH handler; - void * data; + void *data; { ipcache_entry *e; IpPending *pending; diff --git a/src/store.cc b/src/store.cc index fa1bc75ce6..1c7b413deb 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,5 +1,5 @@ -/* $Id: store.cc,v 1.31 1996/04/05 17:47:48 wessels Exp $ */ +/* $Id: store.cc,v 1.32 1996/04/05 17:48:32 wessels Exp $ */ /* * DEBUG: Section 20 store @@ -624,7 +624,7 @@ int storeRegister(e, fd, handler, data) StoreEntry *e; int fd; PIF handler; - void * data; + void *data; { PendingEntry *pe = (PendingEntry *) xmalloc(sizeof(PendingEntry)); int old_size, i, j; @@ -1489,8 +1489,8 @@ StoreEntry *storeGetNext() /* walk through every single entry in the storage and invoke a given routine */ int storeWalkThrough(proc, data) - int (*proc) _PARAMS((StoreEntry * e, void * data)); - void * data; + int (*proc) _PARAMS((StoreEntry * e, void *data)); + void *data; { StoreEntry *e = NULL; int count = 0; @@ -1511,7 +1511,7 @@ int storeWalkThrough(proc, data) /* return 1 if it expired, 0 if not */ int removeOldEntry(e, data) StoreEntry *e; - void * data; + void *data; { time_t curtime = *((time_t *) data); @@ -1536,7 +1536,7 @@ int storePurgeOld() int n; debug(20, 3, "storePurgeOld: Begin purging TTL-expired objects\n"); - n = storeWalkThrough(removeOldEntry, (void *) & cached_curtime); + n = storeWalkThrough(removeOldEntry, (void *) &cached_curtime); debug(20, 3, "storePurgeOld: Done purging TTL-expired objects.\n"); debug(20, 3, "storePurgeOld: %d objects expired\n", n); return n;