--------------------- PatchSet 3678 Date: 2006/09/03 17:13:50 Author: serassio Branch: nt Tag: (none) Log: Ran astyle and some other minor fixes Members: CONTRIBUTORS:1.1.2.12->1.1.2.13 src/helper.cc:1.10.2.20->1.10.2.21 src/icmp.cc:1.7.2.9->1.7.2.10 src/ipc_win32.cc:1.1.2.1->1.1.2.2 src/unlinkd.cc:1.7.2.11->1.7.2.12 src/DiskIO/DiskDaemon/DiskdIOStrategy.cc:1.1.2.4->1.1.2.5 Index: squid3/CONTRIBUTORS =================================================================== RCS file: /cvsroot/squid-sf//squid3/CONTRIBUTORS,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -r1.1.2.12 -r1.1.2.13 --- squid3/CONTRIBUTORS 25 Aug 2006 20:11:29 -0000 1.1.2.12 +++ squid3/CONTRIBUTORS 3 Sep 2006 17:13:50 -0000 1.1.2.13 @@ -82,7 +82,8 @@ Sergio Rabellino Ian Turner Moez Mahfoudh - Guido Serassio + Guido Serassio + Andrey Shorin Miquel van Smoorenburg Brian Ian Castle Index: squid3/src/helper.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/helper.cc,v retrieving revision 1.10.2.20 retrieving revision 1.10.2.21 diff -u -r1.10.2.20 -r1.10.2.21 --- squid3/src/helper.cc 3 Sep 2006 16:51:26 -0000 1.10.2.20 +++ squid3/src/helper.cc 3 Sep 2006 17:13:50 -0000 1.10.2.21 @@ -1,6 +1,6 @@ /* - * $Id: helper.cc,v 1.10.2.20 2006/09/03 16:51:26 serassio Exp $ + * $Id: helper.cc,v 1.10.2.21 2006/09/03 17:13:50 serassio Exp $ * * DEBUG: section 84 Helper process maintenance * AUTHOR: Harvest Derived? @@ -83,7 +83,7 @@ pid_t pid; int rfd; int wfd; - void * hIpc; + void * hIpc; wordlist *w; if (hlp->cmdline == NULL) @@ -116,12 +116,12 @@ getCurrentTime(); rfd = wfd = -1; pid = ipcCreate(hlp->ipc_type, - progname, - args, - shortname, - &rfd, - &wfd, - &hIpc); + progname, + args, + shortname, + &rfd, + &wfd, + &hIpc); if (pid < 0) { debug(84, 1) ("WARNING: Cannot run '%s' process.\n", progname); @@ -130,7 +130,7 @@ hlp->n_running++; hlp->n_active++; - CBDATA_INIT_TYPE(helper_server); + CBDATA_INIT_TYPE(helper_server); srv = cbdataAlloc(helper_server); srv->hIpc = hIpc; srv->pid = pid; @@ -218,12 +218,12 @@ getCurrentTime(); rfd = wfd = -1; pid = ipcCreate(hlp->ipc_type, - progname, - args, - shortname, - &rfd, - &wfd, - &hIpc); + progname, + args, + shortname, + &rfd, + &wfd, + &hIpc); if (pid < 0) { debug(84, 1) ("WARNING: Cannot run '%s' process.\n", progname); @@ -232,7 +232,7 @@ hlp->n_running++; hlp->n_active++; - CBDATA_INIT_TYPE(helper_stateful_server); + CBDATA_INIT_TYPE(helper_stateful_server); srv = cbdataAlloc(helper_stateful_server); srv->hIpc = hIpc; srv->pid = pid; @@ -245,7 +245,7 @@ srv->index = k; srv->rfd = rfd; srv->wfd = wfd; - srv->rbuf = (char *)memAllocBuf(8192, &srv->rbuf_sz); + srv->rbuf = (char *)memAllocBuf(8192, &srv->rbuf_sz); srv->roffset = 0; srv->parent = cbdataReference(hlp); Index: squid3/src/icmp.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/icmp.cc,v retrieving revision 1.7.2.9 retrieving revision 1.7.2.10 diff -u -r1.7.2.9 -r1.7.2.10 --- squid3/src/icmp.cc 3 Sep 2006 16:51:26 -0000 1.7.2.9 +++ squid3/src/icmp.cc 3 Sep 2006 17:13:50 -0000 1.7.2.10 @@ -1,6 +1,6 @@ /* - * $Id: icmp.cc,v 1.7.2.9 2006/09/03 16:51:26 serassio Exp $ + * $Id: icmp.cc,v 1.7.2.10 2006/09/03 17:13:50 serassio Exp $ * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels @@ -260,12 +260,12 @@ args[0] = "(pinger)"; args[1] = NULL; pid = ipcCreate(IPC_DGRAM, - Config.Program.pinger, - args, - "Pinger Socket", - &rfd, - &wfd, - &hIpc); + Config.Program.pinger, + args, + "Pinger Socket", + &rfd, + &wfd, + &hIpc); if (pid < 0) return; Index: squid3/src/ipc_win32.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ipc_win32.cc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/src/ipc_win32.cc 3 Sep 2006 16:51:26 -0000 1.1.2.1 +++ squid3/src/ipc_win32.cc 3 Sep 2006 17:13:50 -0000 1.1.2.2 @@ -1,9 +1,9 @@ /* - * $Id: ipc_win32.cc,v 1.1.2.1 2006/09/03 16:51:26 serassio Exp $ + * $Id: ipc_win32.cc,v 1.1.2.2 2006/09/03 17:13:50 serassio Exp $ * - * DEBUG: section 54 Interprocess Communication - * AUTHOR: Duane Wessels + * DEBUG: section 54 Windows Interprocess Communication + * AUTHOR: Andrey Shorin & Guido Serassio * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- Index: squid3/src/unlinkd.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/unlinkd.cc,v retrieving revision 1.7.2.11 retrieving revision 1.7.2.12 diff -u -r1.7.2.11 -r1.7.2.12 --- squid3/src/unlinkd.cc 3 Sep 2006 16:51:26 -0000 1.7.2.11 +++ squid3/src/unlinkd.cc 3 Sep 2006 17:13:50 -0000 1.7.2.12 @@ -1,6 +1,6 @@ /* - * $Id: unlinkd.cc,v 1.7.2.11 2006/09/03 16:51:26 serassio Exp $ + * $Id: unlinkd.cc,v 1.7.2.12 2006/09/03 17:13:50 serassio Exp $ * * DEBUG: section 2 Unlink Daemon * AUTHOR: Duane Wessels @@ -232,8 +232,8 @@ args[1] = NULL; pid = ipcCreate( #if USE_POLL && defined(_SQUID_OSF_) - /* pipes and poll() don't get along on DUNIX -DW */ - IPC_STREAM, + /* pipes and poll() don't get along on DUNIX -DW */ + IPC_STREAM, #elif defined(_SQUID_MSWIN_) /* select() will fail on a pipe */ IPC_TCP_SOCKET, @@ -241,12 +241,12 @@ /* We currently need to use FIFO.. see below */ IPC_FIFO, #endif - Config.Program.unlinkd, - args, - "unlinkd", - &unlinkd_rfd, - &unlinkd_wfd, - &hIpc); + Config.Program.unlinkd, + args, + "unlinkd", + &unlinkd_rfd, + &unlinkd_wfd, + &hIpc); if (pid < 0) fatal("Failed to create unlinkd subprocess"); Index: squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 3 Sep 2006 16:51:27 -0000 1.1.2.4 +++ squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 3 Sep 2006 17:13:50 -0000 1.1.2.5 @@ -1,6 +1,6 @@ /* - * $Id: DiskdIOStrategy.cc,v 1.1.2.4 2006/09/03 16:51:27 serassio Exp $ + * $Id: DiskdIOStrategy.cc,v 1.1.2.5 2006/09/03 17:13:50 serassio Exp $ * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels @@ -154,7 +154,7 @@ DiskdIOStrategy::init() { int pid; - void * hIpc + void * hIpc; int rfd; int ikey; const char *args[5]; @@ -188,12 +188,12 @@ args[3] = skey3; args[4] = NULL; pid = ipcCreate(IPC_STREAM, - Config.Program.diskd, - args, - "diskd", - &rfd, - &wfd, - &hIpc); + Config.Program.diskd, + args, + "diskd", + &rfd, + &wfd, + &hIpc); if (pid < 0) fatalf("execl: %s", Config.Program.diskd);