diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2002-04-19 07:20:41 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2002-04-19 07:20:41 (GMT) |
| commit | f5d5e9e2ff980545217a4f9efb6a4ff1ac90f8b9 (patch) | |
| tree | 8e8f3b4d1c47d20ccfecf11bd0b3a3a1cb5d2265 /src | |
| parent | 40117dd3849be65d039ca6aa02bb6d6a338c7f7b (diff) | |
| download | hdf5-f5d5e9e2ff980545217a4f9efb6a4ff1ac90f8b9.zip hdf5-f5d5e9e2ff980545217a4f9efb6a4ff1ac90f8b9.tar.gz hdf5-f5d5e9e2ff980545217a4f9efb6a4ff1ac90f8b9.tar.bz2 | |
[svn-r5205] Purpose:
Code cleanup
Description:
Platform dependent code related to the struct stat and fstat
calls polluted source codes. Hard to maintain.
Solution:
Platform dependent code are moved to H5private.h and then internal
code can #include H5private.h. Repeat those macro definition for
the stdio and multi drivers since they area examples for writing
a virtual file driver. They must not use any internal code.
Platforms tested:
eirene (parallel), modi4 (serial including gass driver.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5D.c | 1 | ||||
| -rw-r--r-- | src/H5FDgass.c | 6 | ||||
| -rw-r--r-- | src/H5FDlog.c | 4 | ||||
| -rw-r--r-- | src/H5FDsec2.c | 10 | ||||
| -rw-r--r-- | src/H5private.h | 3 |
5 files changed, 10 insertions, 14 deletions
@@ -4018,6 +4018,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t *size) H5D_t *dset = NULL; FUNC_ENTER(H5Dset_extent, FAIL); + H5TRACE2("e","i*h",dset_id,size); /* Check args */ if(H5I_DATASET != H5I_get_type(dset_id) diff --git a/src/H5FDgass.c b/src/H5FDgass.c index 5ef425a..c43843e 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -332,11 +332,7 @@ H5FD_gass_open(const char *name, unsigned flags, hid_t fapl_id, H5FD_gass_fapl_t _fa; char *filename = (char *) H5MM_malloc(80 * sizeof(char)); H5P_genplist_t *plist; /* Property list pointer */ -#ifdef WIN32 - struct _stati64 sb; -#else - struct stat sb; -#endif + h5_stat_t sb; FUNC_ENTER(H5FD_gass_open, NULL); diff --git a/src/H5FDlog.c b/src/H5FDlog.c index ee5dc14..63f2dec 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -475,10 +475,8 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, HFILE filehandle; struct _BY_HANDLE_FILE_INFORMATION fileinfo; int results; - struct _stati64 sb; -#else - struct stat sb; #endif + h5_stat_t sb; H5P_genplist_t *plist; /* Property list */ FUNC_ENTER(H5FD_log_open, NULL); diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 8841b2b..026f27a 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -273,13 +273,11 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, int fd; H5FD_sec2_t *file=NULL; #ifdef WIN32 - HFILE filehandle; - struct _BY_HANDLE_FILE_INFORMATION fileinfo; - int results; - struct _stati64 sb; -#else - struct stat sb; + HFILE filehandle; + struct _BY_HANDLE_FILE_INFORMATION fileinfo; + int results; #endif + h5_stat_t sb; FUNC_ENTER(H5FD_sec2_open, NULL); diff --git a/src/H5private.h b/src/H5private.h index e8c5056..47d44cd 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -562,10 +562,13 @@ __DLL__ int HDfprintf (FILE *stream, const char *fmt, ...); /* fscanf() variable arguments */ #define HDfseek(F,O,W) fseek(F,O,W) #define HDfsetpos(F,P) fsetpos(F,P) +/* definitions related to the file stat utilities */ #ifdef WIN32 #define HDfstat(F,B) _fstati64(F,B) +typedef struct _stati64 h5_stat_t; #else #define HDfstat(F,B) fstat(F,B) +typedef struct stat h5_stat_t; #endif #define HDftell(F) ftell(F) #define HDfwrite(M,Z,N,F) fwrite(M,Z,N,F) |