diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-10-05 21:16:47 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-10-05 21:16:47 (GMT) |
| commit | d05369f41d078275b9f8879283ff9504a6a9f520 (patch) | |
| tree | 23ba6bc147ac64fed79a19a8e3b87e15d0783123 /src/H5Fprivate.h | |
| parent | 81e4ce7805a034e7684f48a208621180cc168921 (diff) | |
| parent | 4dc2218ab5622f81c3dd9d68020ac7357f413c50 (diff) | |
| download | hdf5-d05369f41d078275b9f8879283ff9504a6a9f520.zip hdf5-d05369f41d078275b9f8879283ff9504a6a9f520.tar.gz hdf5-d05369f41d078275b9f8879283ff9504a6a9f520.tar.bz2 | |
[svn-r27959] - merge from trunk (pre-VDS)
- fix VOL initialization and Native plugin registration with new FAPL changes
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 3f58e40..a2dc95a 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -443,10 +443,8 @@ #define H5F_ACS_SIEVE_BUF_SIZE_NAME "sieve_buf_size" /* Maximum sieve buffer size (when data sieving is allowed by file driver) */ #define H5F_ACS_SDATA_BLOCK_SIZE_NAME "sdata_block_size" /* Minimum "small data" allocation block size (when aggregating "small" raw data allocations) */ #define H5F_ACS_GARBG_COLCT_REF_NAME "gc_ref" /* Garbage-collect references */ -#define H5F_ACS_FILE_DRV_ID_NAME "driver_id" /* File driver ID */ -#define H5F_ACS_FILE_DRV_INFO_NAME "driver_info" /* File driver info */ -#define H5F_ACS_VOL_ID_NAME "vol_id" /* File VOL ID */ -#define H5F_ACS_VOL_INFO_NAME "vol_info" /* FILE VOL info */ +#define H5F_ACS_FILE_DRV_NAME "driver-id/info" /* File driver ID & info */ +#define H5F_ACS_VOL_NAME "plugin-id/info" /* VOL plugin ID & info */ #define H5F_ACS_CLOSE_DEGREE_NAME "close_degree" /* File close degree */ #define H5F_ACS_FAMILY_OFFSET_NAME "family_offset" /* Offset position in file for family file driver */ #define H5F_ACS_FAMILY_NEWSIZE_NAME "family_newsize" /* New member size of family driver. (private property only used by h5repart) */ @@ -671,9 +669,6 @@ H5_DLL void H5F_addr_encode_len(size_t addr_len, uint8_t **pp, haddr_t addr); H5_DLL void H5F_addr_decode(const H5F_t *f, const uint8_t **pp, haddr_t *addr_p); H5_DLL void H5F_addr_decode_len(size_t addr_len, const uint8_t **pp, haddr_t *addr_p); -/* File access property list callbacks */ -H5_DLL herr_t H5P_facc_close(hid_t dxpl_id, void *close_data); - /* Shared file list related routines */ H5_DLL void H5F_sfile_assert_num(unsigned n); |