summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2006-03-13 19:36:55 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2006-03-13 19:36:55 +0000
commitc8a46b21655a9e52b3e7958f3af858be27051f3d (patch)
tree7e91936f801f536f51f0bbd7d476fd840af96ca3 /file_io
parentc7b87e899b9ddedcb23754c12dcaf398ab79ceb6 (diff)
downloadapr-c8a46b21655a9e52b3e7958f3af858be27051f3d.tar.gz
Distinguish rc from rv (DWORD v.s. apr_status_t) - a 64bit-ism.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@385631 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r--file_io/win32/seek.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/file_io/win32/seek.c b/file_io/win32/seek.c
index 9313c29bc..9148181a4 100644
--- a/file_io/win32/seek.c
+++ b/file_io/win32/seek.c
@@ -42,24 +42,23 @@ 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 = 0;
thefile->bufpos = thefile->dataRead = 0;
thefile->filePtr = pos;
}
}
- return rc;
+ return rv;
}