summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-08-01 17:21:38 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-08-01 17:21:38 (GMT)
commit6fb7471ecd106e022d7946ab140ebb47f85072bf (patch)
treeda5bb4bab2355902fcc93330b248a0132b14b32a
parentac7cf1ddd66e3dcece26c1ed2137f07d16515b92 (diff)
parent24bf2f836ff540910cf0daa8489992aabe27a0e6 (diff)
downloadhdf5-6fb7471ecd106e022d7946ab140ebb47f85072bf.zip
hdf5-6fb7471ecd106e022d7946ab140ebb47f85072bf.tar.gz
hdf5-6fb7471ecd106e022d7946ab140ebb47f85072bf.tar.bz2
Merge pull request #1828 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '24bf2f836ff540910cf0daa8489992aabe27a0e6': Remove extra checks added during merge
-rw-r--r--test/getname.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/test/getname.c b/test/getname.c
index 842f6db..34aec93 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -2579,13 +2579,6 @@ test_obj_ref(hid_t fapl)
if(!((HDstrcmp(buf, "/Dataset3") == 0) &&(namelen == 9))) TEST_ERROR
*buf = '\0';
- /* Check H5Rget_name returns the correct length of the name when name is NULL */
- namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[0], NULL, 0);
- if(namelen != 9) TEST_ERROR
- /* Make sure size parameter is ignored */
- namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[0], NULL, 200);
- if(namelen != 9) TEST_ERROR
-
namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[0], (char*)buf, sizeof(buf));
if(!((HDstrcmp(buf, "/Dataset3") == 0) &&(namelen == 9))) TEST_ERROR
PASSED()
@@ -2823,12 +2816,7 @@ test_reg_ref(hid_t fapl)
/* Get name of the dataset the first region reference points to using H5Rget_name */
TESTING("H5Rget_name to get name from region reference(hyperslab)");
*buf1 = '\0';
-
- /* Check H5Rget_name returns the correct length of the name when name is NULL */
- name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], NULL, 0);
- if(name_size1 != 7) TEST_ERROR
-
- name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, NAME_BUF_SIZE );
+ name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, NAME_BUF_SIZE);
if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR
PASSED()