apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r385633 - /apr/apr/branches/1.2.x/file_io/win32/seek.c
Date Mon, 13 Mar 2006 19:37:21 GMT
Author: wrowe
Date: Mon Mar 13 11:37:20 2006
New Revision: 385633

URL: http://svn.apache.org/viewcvs?rev=385633&view=rev
Log:

  Distinguish rc from rv (DWORD v.s. apr_status_t) - a 64bit-ism.

Backports: 385631

Modified:
    apr/apr/branches/1.2.x/file_io/win32/seek.c

Modified: apr/apr/branches/1.2.x/file_io/win32/seek.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/file_io/win32/seek.c?rev=385633&r1=385632&r2=385633&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/file_io/win32/seek.c (original)
+++ apr/apr/branches/1.2.x/file_io/win32/seek.c Mon Mar 13 11:37:20 2006
@@ -42,24 +42,23 @@
 
     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;
 }
 
 



Mime
View raw message