diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-02 21:10:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-02 21:10:35 (GMT) |
| commit | 47e4e67e3cd11f99ac417613eed9f47e65f55468 (patch) | |
| tree | c58101c6d80e27b27255d6800a0f105999d758d6 /src/H5Defl.c | |
| parent | c4fc0074ae04fc2d0b9b0b92a6a214af612e8194 (diff) | |
| download | hdf5-47e4e67e3cd11f99ac417613eed9f47e65f55468.zip hdf5-47e4e67e3cd11f99ac417613eed9f47e65f55468.tar.gz hdf5-47e4e67e3cd11f99ac417613eed9f47e65f55468.tar.bz2 | |
[svn-r17146] Description:
Bring a bunch of misc. improvements & tweaks from the revise_chunks
branch back to the trunk, so that future merges won't be so painful.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Defl.c')
| -rw-r--r-- | src/H5Defl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/H5Defl.c b/src/H5Defl.c index a22ca2d..cb31630 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -49,8 +49,7 @@ /********************/ /* Layout operation callbacks */ -static herr_t H5D_efl_construct(H5F_t *f, hid_t dapl_id, hid_t dxpl_id, H5D_t *dset, - const H5P_genplist_t *dc_plist); +static herr_t H5D_efl_construct(H5F_t *f, H5D_t *dset); static hbool_t H5D_efl_is_space_alloc(const H5O_layout_t *layout); static herr_t H5D_efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space, @@ -76,6 +75,7 @@ static herr_t H5D_efl_write(const H5O_efl_t *efl, haddr_t addr, size_t size, /* External File List (EFL) storage layout I/O ops */ const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{ H5D_efl_construct, + NULL, H5D_efl_is_space_alloc, H5D_efl_io_init, H5D_contig_read, @@ -109,8 +109,7 @@ const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{ *------------------------------------------------------------------------- */ static herr_t -H5D_efl_construct(H5F_t *f, hid_t UNUSED dapl_id, hid_t UNUSED dxpl_id, H5D_t *dset, - const H5P_genplist_t *dc_plist) +H5D_efl_construct(H5F_t *f, H5D_t *dset) { size_t dt_size; /* Size of datatype */ hsize_t dim[H5O_LAYOUT_NDIMS]; /* Current size of data in elements */ @@ -127,7 +126,6 @@ H5D_efl_construct(H5F_t *f, hid_t UNUSED dapl_id, hid_t UNUSED dxpl_id, H5D_t *d /* Sanity checks */ HDassert(f); HDassert(dset); - HDassert(dc_plist); /* * The maximum size of the dataset cannot exceed the storage size. |