summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2006-03-13 19:37:30 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2006-03-13 19:37:30 +0000
commita7a3eb6b94a1564955ed549d86feae72448c4394 (patch)
tree7fdc2698289d48dd6e3ea3e318fcb449d3193c23 /file_io
parentcc235ce6ca32e1205421e1aca0f3c8b8251f1acf (diff)
downloadlibapr-a7a3eb6b94a1564955ed549d86feae72448c4394.tar.gz
Distinguish rc from rv (DWORD v.s. apr_status_t) - a 64bit-ism.
Backports: 385631 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@385634 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r--file_io/win32/seek.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/file_io/win32/seek.c b/file_io/win32/seek.c
index fcca874fc..ec34eec56 100644
--- a/file_io/win32/seek.c
+++ b/file_io/win32/seek.c
@@ -37,17 +37,16 @@ static apr_status_t setptr(apr_file_t *thefile, apr_off_t pos )
if (newbufpos >= 0 && newbufpos <= thefile->dataRead) {
thefile->bufpos = (apr_size_t)newbufpos;
- rc = 0;
+ rv = APR_SUCCESS;
} else {
DWORD offlo = (DWORD)pos;
DWORD offhi = (DWORD)(pos >> 32);
rc = SetFilePointer(thefile->filehand, offlo, &offhi, FILE_BEGIN);
if (rc == 0xFFFFFFFF)
- rc = apr_get_os_error();
- else
- rc = APR_SUCCESS;
- if (rc == APR_SUCCESS) {
+ rv = apr_get_os_error();
+ else {
+ rv = APR_SUCCESS;
thefile->eof_hit = thefile->bufpos = thefile->dataRead = 0;
thefile->filePtr = pos;
}