summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2018-12-07 15:24:09 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2018-12-07 15:24:09 (GMT)
commit7155b037ed7f072039526c4e1baa0ff1f2017f09 (patch)
tree4d8075f923be3b37920d72698933ec40b8b28953
parent5d457dd379b1a29814bdda78f5daead1b83fe1aa (diff)
parent1f96bda4b77efb53c4eddb5414d50e51cdc44390 (diff)
downloadhdf5-7155b037ed7f072039526c4e1baa0ff1f2017f09.zip
hdf5-7155b037ed7f072039526c4e1baa0ff1f2017f09.tar.gz
hdf5-7155b037ed7f072039526c4e1baa0ff1f2017f09.tar.bz2
Merge pull request #1361 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10 to hdf5_1_10
* commit '1f96bda4b77efb53c4eddb5414d50e51cdc44390': Fixed typos. Platforms tested: Linux/64 (jelly)
-rw-r--r--src/H5D.c9
-rw-r--r--src/H5Dchunk.c15
-rw-r--r--test/chunk_info.c17
3 files changed, 13 insertions, 28 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 32b2453..8ff6a15 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1148,7 +1148,7 @@ done:
* Return: Non-negative on success, negative on failure
*
* Programmer: Binh-Minh Ribler
- * August 2018 (EED-343)
+ * August 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -1199,7 +1199,7 @@ done:
* Return: Non-negative on success, negative on failure
*
* Programmer: Binh-Minh Ribler
- * August 2018 (EED-343)
+ * August 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -1208,7 +1208,6 @@ H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t index, hsize_t *offset
{
H5D_t *dset = NULL;
const H5S_t *space; /* Dataspace for dataset */
- hsize_t space_allocated = 0;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
@@ -1220,8 +1219,6 @@ H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t index, hsize_t *offset
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset ID")
if(NULL == (space = (const H5S_t *)H5I_object_verify(fspace_id, H5I_DATASPACE)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace ID")
- if(index < 0)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument (null)")
if(NULL == offset && NULL == filter_mask && NULL == addr && NULL == size)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid arguments, must have at least one non-null output argument")
@@ -1253,7 +1250,7 @@ done:
* Return: Non-negative on success, negative on failure
*
* Programmer: Binh-Minh Ribler
- * August 2018 (EED-343)
+ * August 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 7aaea74..3722475 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -6754,11 +6754,10 @@ done:
* Note: Currently, this function only gets the number of all written
* chunks, regardless the dataspace.
*
- * Return: Success: H5_ITER_CONT or H5_ITER_STOP
- * Failure: Negative (H5_ITER_ERROR)
+ * Return: H5_ITER_CONT
*
* Programmer: Binh-Minh Ribler
- * September 2018 (EED-343)
+ * September 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -6790,7 +6789,7 @@ H5D__get_num_chunks_cb(const H5D_chunk_rec_t H5_ATTR_UNUSED *chunk_rec, void *_u
* Failure: Negative
*
* Programmer: Binh-Minh Ribler
- * September 2018 (EED-343)
+ * September 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -6852,7 +6851,7 @@ done:
* Failure: Negative (H5_ITER_ERROR)
*
* Programmer: Binh-Minh Ribler
- * September 2018 (EED-343)
+ * September 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -6902,7 +6901,7 @@ H5D__get_chunk_info_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
* Failure: FAIL
*
* Programmer: Binh-Minh Ribler
- * September 2018 (EED-343)
+ * September 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -6989,7 +6988,7 @@ done:
* Failure: Negative (H5_ITER_ERROR)
*
* Programmer: Binh-Minh Ribler
- * September 2018 (EED-343)
+ * September 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
@@ -7037,7 +7036,7 @@ H5D__get_chunk_info_by_coord_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
* Failure: Negative
*
* Programmer: Binh-Minh Ribler
- * September 2018 (EED-343)
+ * September 2018 (HDFFV-10615)
*
*-------------------------------------------------------------------------
*/
diff --git a/test/chunk_info.c b/test/chunk_info.c
index 7cc27eb..9c84953 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -112,7 +112,7 @@ void reinit_vars(unsigned *read_filter_mask, haddr_t *addr, hsize_t *size)
* will be implemented in the next version.
*
* Description:
- * This function tests the new API functions added for EED-343:
+ * This function tests the new API functions added for HDFFV-10615:
* H5Dget_num_chunks, H5Dget_chunk_info, and H5Dget_chunk_info_by_coord.
*
* Date: September 2018
@@ -149,17 +149,8 @@ test_get_chunk_info(void)
TESTING("getting chunk information");
- /* Create a copy of file access property list */
- if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR
-
- /* Set high bound to V18 */
- low = H5F_LIBVER_EARLIEST;
- high = H5F_LIBVER_V18;
- if (H5Pset_libver_bounds(fapl, low, high) < 0)
- TEST_ERROR;
-
/* Create a file */
- h5_fixname(FILENAME, fapl, filename, sizeof filename);
+ h5_fixname(FILENAME, H5P_DEFAULT, filename, sizeof filename);
if((chunkfile = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
TEST_ERROR
@@ -372,7 +363,7 @@ error:
* Pedro in main() that writes a 4x4 dataset by iterating on
* 2x2 chunks at a time, with the intention of making a frame
* work to test H5Dget_chunk_info, which was not in the library,
- * until now. For the work in EED-343, the test function
+ * until now. For the work in HDFFV-10615, the test function
* test_get_chunk_info was added to test the new query chunk
* API functions: H5Dget_num_chunk, H5Dget_chunk_info, and
* H5Dget_chunk_info_by_coord. This code can be used at a
@@ -472,8 +463,6 @@ create_4x4_dset(void)
if (H5Pclose(pid) < 0) TEST_ERROR
if (H5Fclose(fid) < 0) TEST_ERROR
- PASSED();
-
return SUCCEED;
error: