--------------------- PatchSet 8694 Date: 2006/09/30 15:46:41 Author: serassio Branch: nt Tag: (none) Log: Ran indent Members: src/fs/coss/aio_win32.c:1.1.2.5->1.1.2.6 src/fs/coss/aio_win32.h:1.1.2.4->1.1.2.5 src/fs/coss/store_io_coss.c:1.15.8.18->1.15.8.19 Index: squid/src/fs/coss/aio_win32.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/coss/Attic/aio_win32.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/src/fs/coss/aio_win32.c 22 Sep 2006 11:34:51 -0000 1.1.2.5 +++ squid/src/fs/coss/aio_win32.c 30 Sep 2006 15:46:41 -0000 1.1.2.6 @@ -1,6 +1,6 @@ /* - * $Id: aio_win32.c,v 1.1.2.5 2006/09/22 11:34:51 serassio Exp $ + * $Id: aio_win32.c,v 1.1.2.6 2006/09/30 15:46:41 serassio Exp $ * * DEBUG: section 81 aio_xxx() POSIX emulation on Windows * AUTHOR: Guido Serassio @@ -37,7 +37,7 @@ #include "aio_win32.h" #ifdef _SQUID_MSWIN_ -VOID CALLBACK +VOID CALLBACK IoCompletionRoutine(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped) { @@ -50,7 +50,7 @@ } -int +int aio_read(struct aiocb *aiocbp) { LPOVERLAPPED Overlapped; @@ -91,7 +91,7 @@ } -int +int aio_write(struct aiocb *aiocbp) { LPOVERLAPPED Overlapped; @@ -132,21 +132,21 @@ } -ssize_t +ssize_t aio_return(struct aiocb * aiocbp) { return aiocbp->aio_sigevent.sigev_signo; } -int +int aio_error(const struct aiocb *aiocbp) { return aiocbp->aio_sigevent.sigev_notify; } -int +int aio_open(const char *path, int mode) { HANDLE hndl; @@ -188,7 +188,7 @@ return fd; } -void +void aio_close(int fd) { CloseHandle((HANDLE) _get_osfhandle(fd)); Index: squid/src/fs/coss/aio_win32.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/coss/Attic/aio_win32.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/src/fs/coss/aio_win32.h 16 Sep 2006 18:59:25 -0000 1.1.2.4 +++ squid/src/fs/coss/aio_win32.h 30 Sep 2006 15:46:41 -0000 1.1.2.5 @@ -1,5 +1,5 @@ /* - * $Id: aio_win32.h,v 1.1.2.4 2006/09/16 18:59:25 serassio Exp $ + * $Id: aio_win32.h,v 1.1.2.5 2006/09/30 15:46:41 serassio Exp $ * * aio_xxx() POSIX emulation on WIN32 for COSS * AUTHOR: Guido Serassio @@ -51,9 +51,9 @@ #ifndef __USE_FILE_OFFSET64 char __pad[sizeof(int64_t) - sizeof(off_t)]; #endif - int aio_reqprio; /* request priority offset */ + int aio_reqprio; /* request priority offset */ struct sigevent aio_sigevent; /* signal number and offset */ - int aio_lio_opcode; /* listio operation */ + int aio_lio_opcode; /* listio operation */ }; int aio_read(struct aiocb *); Index: squid/src/fs/coss/store_io_coss.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/coss/store_io_coss.c,v retrieving revision 1.15.8.18 retrieving revision 1.15.8.19 diff -u -r1.15.8.18 -r1.15.8.19 --- squid/src/fs/coss/store_io_coss.c 30 Sep 2006 15:22:01 -0000 1.15.8.18 +++ squid/src/fs/coss/store_io_coss.c 30 Sep 2006 15:46:41 -0000 1.15.8.19 @@ -718,8 +718,8 @@ t->buffer, /* data buffer */ (size_t) (end - t->diskstart), /* number of bytes to write */ NULL, /* number of bytes written */ - Overlapped); /* overlapped buffer */ - WaitForSingleObject(hEvent, INFINITE); + Overlapped); /* overlapped buffer */ + WaitForSingleObject(hEvent, INFINITE); #else lseek(cs->fd, t->diskstart, SEEK_SET); FD_WRITE_METHOD(cs->fd, t->buffer, end - t->diskstart);