Author: wrowe
Date: Tue Feb 28 13:35:49 2006
New Revision: 381789
URL: http://svn.apache.org/viewcvs?rev=381789&view=rev
Log:
Several readwrite fixes require this code to become legible,
so pre-prettify the code to match conventional style.
No effective change. Backports 381788
Modified:
apr/apr/branches/1.2.x/file_io/win32/readwrite.c
Modified: apr/apr/branches/1.2.x/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/file_io/win32/readwrite.c?rev=381789&r1=381788&r2=381789&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/1.2.x/file_io/win32/readwrite.c Tue Feb 28 13:35:49 2006
@@ -86,23 +86,28 @@
rv = WaitForSingleObject(file->pOverlapped->hEvent, INFINITE);
}
switch (rv) {
- case WAIT_OBJECT_0:
- GetOverlappedResult(file->filehand, file->pOverlapped,
- (LPDWORD)nbytes, TRUE);
- rv = APR_SUCCESS;
- break;
- case WAIT_TIMEOUT:
- rv = APR_TIMEUP;
- break;
- case WAIT_FAILED:
- rv = apr_get_os_error();
- break;
- default:
- break;
+ case WAIT_OBJECT_0:
+ GetOverlappedResult(file->filehand, file->pOverlapped,
+ (LPDWORD)nbytes, TRUE);
+ rv = APR_SUCCESS;
+ break;
+
+ case WAIT_TIMEOUT:
+ rv = APR_TIMEUP;
+ break;
+
+ case WAIT_FAILED:
+ rv = apr_get_os_error();
+ break;
+
+ default:
+ break;
}
+
if (rv != APR_SUCCESS) {
- if (apr_os_level >= APR_WIN_98)
+ if (apr_os_level >= APR_WIN_98) {
CancelIo(file->filehand);
+ }
}
}
else if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
|