apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r375872 - in /apr/apr/branches/1.2.x: CHANGES include/arch/unix/apr_arch_file_io.h
Date Wed, 08 Feb 2006 06:31:49 GMT
Author: rooneg
Date: Tue Feb  7 22:31:47 2006
New Revision: 375872

URL: http://svn.apache.org/viewcvs?rev=375872&view=rev
Log:
Merge r375869 and r375870 into the 1.2.x branch.

Original log messages:

Make apr_file_t::filePtr an apr_off_t on unix so that we avoid truncating
the offset into the file when working with files over 2 gigabytes in size.

* include/arch/unix/apr_arch_file_io.h
  (apr_file_t::filePtr): Make this an apr_off_t, since we really need the
   full 64 bits in many cases.

* CHANGES: Note the apr_file_t filePtr change.

Modified:
    apr/apr/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/include/arch/unix/apr_arch_file_io.h

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/CHANGES?rev=375872&r1=375871&r2=375872&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES (original)
+++ apr/apr/branches/1.2.x/CHANGES Tue Feb  7 22:31:47 2006
@@ -1,5 +1,9 @@
 Changes for APR 1.2.4
 
+  *) Make the filePtr in apr_file_t an apr_off_t on Unix, to avoid issues
+     truncating offsets down to 32 bits on large file systems.
+     [Garrett Rooney]
+
   *) Fix seeks with files opened in xthread mode for append on win32.
      [M Joonas Pihlaja <jpihlaja cc.helsinki.fi>, Garrett Rooney]
 

Modified: apr/apr/branches/1.2.x/include/arch/unix/apr_arch_file_io.h
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/include/arch/unix/apr_arch_file_io.h?rev=375872&r1=375871&r2=375872&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/include/arch/unix/apr_arch_file_io.h (original)
+++ apr/apr/branches/1.2.x/include/arch/unix/apr_arch_file_io.h Tue Feb  7 22:31:47 2006
@@ -104,7 +104,7 @@
     int bufpos;               /* Read/Write position in buffer */
     unsigned long dataRead;   /* amount of valid data read into buffer */
     int direction;            /* buffer being used for 0 = read, 1 = write */
-    unsigned long filePtr;    /* position in file of handle */
+    apr_off_t filePtr;        /* position in file of handle */
 #if APR_HAS_THREADS
     struct apr_thread_mutex_t *thlock;
 #endif



Mime
View raw message