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
scantist-ossops-m2 · Mar 13, 2006 · c8a46b2 · c8a46b2
1 parent c7b87e8
commit c8a46b2
Showing 1 changed file with 5 additions and 6 deletions.
diff --git 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;
 }