diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-25 14:32:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-25 14:32:17 (GMT) |
| commit | 95e0006dc2d9e748db4b6e35acfcf56ff31ed416 (patch) | |
| tree | befdc8b2778d707134bd1a528555cc547e4ab33e /src/H5Fpkg.h | |
| parent | ead005cc27f05e2b1497c3651524b7151c9fc48a (diff) | |
| download | hdf5-95e0006dc2d9e748db4b6e35acfcf56ff31ed416.zip hdf5-95e0006dc2d9e748db4b6e35acfcf56ff31ed416.tar.gz hdf5-95e0006dc2d9e748db4b6e35acfcf56ff31ed416.tar.bz2 | |
[svn-r25097] Description:
Make progress toward moving from DXPL IDs to property list structures
within the library. Also move the signature location code from the H5F
package to the H5FD package, where it's a better fit. Also, clean up some
more compiler warnings along the way.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
(h5committest forthcoming)
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 9458223..9f48070 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -53,10 +53,6 @@ # undef H5F_DEBUG #endif -/* Define the HDF5 file signature */ -#define H5F_SIGNATURE "\211HDF\r\n\032\n" -#define H5F_SIGNATURE_LEN 8 - /* Superblock status flags */ #define H5F_SUPER_WRITE_ACCESS 0x01 #define H5F_SUPER_FILE_OK 0x02 @@ -296,7 +292,6 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1]; /* General routines */ H5_DLL herr_t H5F_init(void); H5_DLL herr_t H5F__term_deprec_interface(void); -H5_DLL herr_t H5F_locate_signature(H5FD_t *file, hid_t dxpl_id, haddr_t *sig_addr); H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing); /* File mount related routines */ @@ -322,7 +317,7 @@ H5_DLL herr_t H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size, void *buf); H5_DLL herr_t H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size, const void *buf); -H5_DLL herr_t H5F_accum_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, +H5_DLL herr_t H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, hsize_t size); H5_DLL herr_t H5F__accum_flush(const H5F_io_info_t *fio_info); H5_DLL herr_t H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush); |