diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-09-01 13:03:33 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-09-01 13:03:33 (GMT) |
commit | c839ed338399301b3f861bde5fc8eecb9434462a (patch) | |
tree | df5a053e9f59b81edc49b614b1ee9f2d831a0820 /src/H5Pdapl.c | |
parent | db8e289abe67b506d2a1096d1a39151aca0935e9 (diff) | |
download | hdf5-c839ed338399301b3f861bde5fc8eecb9434462a.zip hdf5-c839ed338399301b3f861bde5fc8eecb9434462a.tar.gz hdf5-c839ed338399301b3f861bde5fc8eecb9434462a.tar.bz2 |
[svn-r27646] Add version number to VDS global heap object encoding.
Fix handling of layout version number.
Other minor fixes/cleanup.
NOTE: This commit changes the file format for VDS, all files must be
re-generated.
Tested: ummon
Diffstat (limited to 'src/H5Pdapl.c')
-rw-r--r-- | src/H5Pdapl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index 94ae0b4..c8df45b 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -368,9 +368,7 @@ done: * H5Pset_virtual_view call. The possible values of view are * H5D_VDS_FIRST_MISSING or H5D_VDS_LAST_AVAIALBLE. * - * Return: Success: H5D_VDS_FIRST_MISSING or - * H5D_VDS_LAST_AVAILABLE - * Failure: H5D_VDS_ERROR + * Return: Non-negative on success/Negative on failure * * Programmer: Neil Fortner * May 4, 2015 @@ -388,12 +386,12 @@ H5Pget_virtual_view(hid_t plist_id, H5D_vds_view_t *view) /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5D_VDS_ERROR, "can't find object for ID") + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* Get value from property list */ if(view) if(H5P_get(plist, H5D_ACS_VDS_VIEW_NAME, view) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5D_VDS_ERROR, "unable to get value") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value") done: FUNC_LEAVE_API(ret_value) @@ -551,12 +549,12 @@ H5Pget_virtual_printf_gap(hid_t plist_id, hsize_t *gap_size) /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5D_VDS_ERROR, "can't find object for ID") + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* Get value from property list */ if(gap_size) if(H5P_get(plist, H5D_ACS_VDS_PRINTF_GAP_NAME, gap_size) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5D_VDS_ERROR, "unable to get value") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value") done: FUNC_LEAVE_API(ret_value) |