diff options
| -rw-r--r-- | java/test/TestH5Pfapl.java | 2 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 3 | ||||
| -rw-r--r-- | src/H5Pfapl.c | 24 |
3 files changed, 15 insertions, 14 deletions
diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 51fa4df..0651502 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -1388,7 +1388,7 @@ public class TestH5Pfapl { } catch (HDF5PropertyListInterfaceException err) { // parallel is not supported - if (err.getMinorErrorNumber() != HDF5Constants.H5E_CANTSET) { + if (err.getMinorErrorNumber() != HDF5Constants.H5E_UNSUPPORTED) { err.printStackTrace(); fail("H5P_evict_on_close: " + err); } diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index f54ca4b..923bba3 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -165,8 +165,9 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to: III. Quick Step Building HDF5 C Static Libraries and Tools with CMake ======================================================================== Notes: This short set of instructions is written for users who want to - quickly build the just the HDF5 C static library and tools from + quickly build just the HDF5 C static library and tools from the HDF5 source code package using the CMake command line tools. + Avoid the use of drive letters in paths on Windows. Go through these steps: diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 7802535..490e647 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -2338,7 +2338,7 @@ done: * 5) H5F_LIBVER_LATEST, H5F_LIBVER_LATEST * See detailed description in the RFC: Setting Bounds for Object Creation in HDF5 1.10.0. * - * Return: Non-negative on success/Negative on failure + * Return: Non-negative on success/Negative on failure * * Programmer: Quincey Koziol * Sunday, December 30, 2007 @@ -2386,7 +2386,7 @@ done: /*------------------------------------------------------------------------- * Function: H5Pget_libver_bounds * - * Purpose: Returns the current settings for the library version format bounds + * Purpose: Returns the current settings for the library version format bounds * from a file access property list. * * Return: Non-negative on success/Negative on failure @@ -2409,7 +2409,7 @@ H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/, /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") - + /* Get values */ if(low) { if(H5P_get(plist, H5F_ACS_LIBVER_LOW_BOUND_NAME, low) < 0) @@ -3798,7 +3798,7 @@ H5P__facc_multi_type_enc(const void *value, void **_pp, size_t *size) FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5P__facc_multi_type_enc() */ - + /*------------------------------------------------------------------------- * Function: H5P__facc_multi_type_dec * @@ -3841,10 +3841,10 @@ H5P__facc_multi_type_dec(const void **_pp, void *_value) * 'high' bound of library format versions property in the * file access property list is encoded. * - * Return: Success: Non-negative - * Failure: Negative + * Return: Success: Non-negative + * Failure: Negative * - * Programmer + * Programmer * *------------------------------------------------------------------------- */ @@ -3878,10 +3878,10 @@ H5P__facc_libver_type_enc(const void *value, void **_pp, size_t *size) * 'high' bound of library format versions property in the * file access property list is decoded. * - * Return: Success: Non-negative - * Failure: Negative + * Return: Success: Non-negative + * Failure: Negative * - * Programmer: + * Programmer: * *------------------------------------------------------------------------- */ @@ -3906,7 +3906,7 @@ H5P__facc_libver_type_dec(const void **_pp, void *_value) /*------------------------------------------------------------------------- - * Function: H5Pset_core_write_tracking + * Function: H5Pset_core_write_tracking * * Purpose: Enables/disables core VFD write tracking and page * aggregation size. @@ -4509,7 +4509,7 @@ H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close) #ifndef H5_HAVE_PARALLEL /* Set value */ if(H5P_set(plist, H5F_ACS_EVICT_ON_CLOSE_FLAG_NAME, &evict_on_close) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set evict on close property") + HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "can't set evict on close property") #else HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "evict on close is currently not supported in parallel HDF5") #endif /* H5_HAVE_PARALLEL */ |