diff options
| -rw-r--r-- | src/H5Pdcpl.c | 22 | ||||
| -rw-r--r-- | test/tfile.c | 88 |
2 files changed, 65 insertions, 45 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 5f13bb5..f986d8c 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -278,24 +278,10 @@ H5P__dcrt_reg_prop(H5P_genclass_t *pclass) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the object header minimization property */ - if (0 > H5P__register_real( - pclass, /* class */ - H5D_CRT_MIN_DSET_HDR_SIZE_NAME, /* name */ - H5D_CRT_MIN_DSET_HDR_SIZE_SIZE, /* size */ - &H5O_ohdr_min_g, /* default */ - NULL, /* create */ - NULL, /* set */ - NULL, /* get */ - H5D_CRT_MIN_DSET_HDR_SIZE_ENC, /* encode */ - H5D_CRT_MIN_DSET_HDR_SIZE_DEC, /* decode */ - NULL, /* delete */ - NULL, /* copy */ - NULL, /* compare */ - NULL)) /* close */ - { - HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, - "can't insert property into class") - } + if (H5P__register_real(pclass, H5D_CRT_MIN_DSET_HDR_SIZE_NAME, H5D_CRT_MIN_DSET_HDR_SIZE_SIZE, &H5O_ohdr_min_g, + NULL, NULL, NULL, H5D_CRT_MIN_DSET_HDR_SIZE_ENC, H5D_CRT_MIN_DSET_HDR_SIZE_DEC, + NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the type ID property*/ if(H5P__register_real(pclass, H5VL_PROP_DSET_TYPE_ID, sizeof(hid_t), &type_id, diff --git a/test/tfile.c b/test/tfile.c index 5cb5517..9a556d4 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -7158,6 +7158,7 @@ test_min_dset_ohdr(void) hid_t file_id = -1; hid_t file2_id = -1; hbool_t minimize; + herr_t ret; MESSAGE(5, ("Testing dataset object header minimization\n")); @@ -7177,15 +7178,19 @@ test_min_dset_ohdr(void) /*---------------------------------------- * TEST default value */ - VERIFY(H5Fget_dset_no_attrs_hint(file_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "getting default dset minimize flag value"); + ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, FALSE, "minimize flag); /*---------------------------------------- * TEST set to TRUE */ - VERIFY(H5Fset_dset_no_attrs_hint(file_id, TRUE), SUCCEED, "H5Fset_dset_no_attrs_hint"); - VERIFY(H5Fget_dset_no_attrs_hint(file_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "getting set-TRUE dset minimize flag value"); + ret = H5Fset_dset_no_attrs_hint(file_id, TRUE); + CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); + + ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, TRUE, "minimize flag); /*---------------------------------------- * TEST second file open on same filename @@ -7193,43 +7198,72 @@ test_min_dset_ohdr(void) file2_id = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); CHECK_I(file2_id, "H5Fopen"); - /* verify TRUE setting on second open */ - VERIFY(H5Fget_dset_no_attrs_hint(file_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "getting set-TRUE dset minimize flag value"); + /* verify TRUE setting on second open + */ + ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, TRUE, "minimize flag"); + + /* re-set to FALSE on first open + */ + ret = H5Fset_dset_no_attrs_hint(file_id, FALSE); + CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); + + /* verify FALSE set on both opens + */ + ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, FALSE, "minimize flag"); - /* re-set to FALSE on first open */ - VERIFY(H5Fset_dset_no_attrs_hint(file_id, FALSE), SUCCEED, "H5Fset_dset_no_attrs_hint"); + ret = H5Fget_dset_no_attrs_hint(file2_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, FALSE, "minimize flag"); - /* verify FALSE set on both opens */ - VERIFY(H5Fget_dset_no_attrs_hint(file_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "getting set-FALSE dset minimize flag value"); - VERIFY(H5Fget_dset_no_attrs_hint(file2_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "getting set-FALSE dset minimize flag value"); + /* re-set to TRUE on second open + */ + ret = H5Fset_dset_no_attrs_hint(file2_id, TRUE); + CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); - /* re-set to TRUE on second open */ - VERIFY(H5Fset_dset_no_attrs_hint(file2_id, TRUE), SUCCEED, "H5Fset_dset_no_attrs_hint"); + /* verify TRUE set on both opens + */ + ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, TRUE, "minimize flag"); - /* verify TRUE set on both opens */ - VERIFY(H5Fget_dset_no_attrs_hint(file_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "getting set-FALSE dset minimize flag value"); - VERIFY(H5Fget_dset_no_attrs_hint(file2_id, &minimize), SUCCEED, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "getting set-FALSE dset minimize flag value"); + ret = H5Fget_dset_no_attrs_hint(file2_id, &minimize); + CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); + VERIFY(minimize, TRUE, "minimize flag"); /*---------------------------------------- * TEST error cases */ + + /* trying to set with invalid file ID */ H5E_BEGIN_TRY { - VERIFY(H5Fset_dset_no_attrs_hint(-1, TRUE), FAIL, "trying to set with invalid file ID"); - VERIFY(H5Fget_dset_no_attrs_hint(-1, &minimize), FAIL, "trying to get with invalid file ID"); - VERIFY(H5Fget_dset_no_attrs_hint(file_id, NULL), FAIL, "trying to get with invalid pointer"); + ret = H5Fset_dset_no_attrs_hint(-1, TRUE); } H5E_END_TRY; + VERIFY(ret, FAIL, "H5Fset_dset_no_attrs_hint"); + + /* trying to get with invalid file ID */ + H5E_BEGIN_TRY { + ret = H5Fget_dset_no_attrs_hint(-1, &minimize); + } H5E_END_TRY; + VERIFY(ret, FAIL, H5Fget_dset_no_attrs_hint); + + /* trying to get with invalid pointer */ + H5E_BEGIN_TRY { + ret = H5Fget_dset_no_attrs_hint(file_id, NULL) + } H5E_END_TRY; + VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint"); /************/ /* TEARDOWN */ /************/ - VERIFY(H5Fclose(file_id), SUCCEED, "H5Fclose"); - VERIFY(H5Fclose(file2_id), SUCCEED, "H5Fclose"); + ret = H5Fclose(file_id); + CHECK(ret, FAIL, "H5Fclose"); + ret = H5Fclose(file2_id); + CHECK(ret, FAIL, "H5Fclose"); } /* end test_min_dset_ohdr() */ /**************************************************************** |