On Wed, Jan 24, 2001 at 01:27:43AM -0800, Greg Stein wrote: > We should simply nuke the "asize" and "csize" since they are nearly > impossible to deal with in any reasonable cross-platform way. If/when > somebody really needs that feature, then we can introduce them.
This patch does just that. It compiles on my Linux box, and fixes
that problem on the BeOS box. The Linux box also seems to test
reasonably.
Index: file_io/unix/filestat.c
===================================================================
RCS file: /home/cvspublic/apr/file_io/unix/filestat.c,v
retrieving revision 1.38
diff -u -r1.38 filestat.c
--- file_io/unix/filestat.c 2001/01/23 04:10:46 1.38
+++ file_io/unix/filestat.c 2001/01/24 09:47:54
@@ -97,10 +97,6 @@
apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
- if (wanted & APR_FINFO_CSIZE) {
- finfo->csize = info.st_blocks * 512;
- finfo->valid |= APR_FINFO_CSIZE;
- }
if (finfo->filetype == APR_LNK) {
finfo->valid |= APR_FINFO_LINK;
}
Index: include/apr_file_info.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_file_info.h,v
retrieving revision 1.5
diff -u -r1.5 apr_file_info.h
--- include/apr_file_info.h 2001/01/23 04:10:47 1.5
+++ include/apr_file_info.h 2001/01/24 09:47:54
@@ -141,8 +141,6 @@
#define APR_FINFO_CTIME 0x00000020
#define APR_FINFO_ATIME 0x00000040
#define APR_FINFO_SIZE 0x00000100
-#define APR_FINFO_ASIZE 0x00000200
-#define APR_FINFO_CSIZE 0x00000400
#define APR_FINFO_DEV 0x00001000
#define APR_FINFO_INODE 0x00002000
#define APR_FINFO_NLINK 0x00004000
@@ -190,10 +188,6 @@
apr_int16_t nlink;
/** The size of the file */
apr_off_t size;
- /** The space allocated for the file */
- apr_off_t asize;
- /** The storage size consumed by the file */
- apr_off_t csize;
/** The time the file was last accessed */
apr_time_t atime;
/** The time the file was last modified */
sam th
[EMAIL PROTECTED]
http://www.abisource.com/~sam/
GnuPG Key:
http://www.abisource.com/~sam/key
pgpJxMS2hR1Us.pgp
Description: PGP signature
