diff options
Diffstat (limited to 'test/unlink.c')
| -rw-r--r-- | test/unlink.c | 1377 |
1 files changed, 686 insertions, 691 deletions
diff --git a/test/unlink.c b/test/unlink.c index 1ad3790..908ea1d 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -77,7 +77,9 @@ const char *FILENAME[] = { #define SLASHES_ROOTLINK_NAME "Root///" #define FULL_GROUP_NUM_KEEP 2 #define FULL_GROUP_NUM_DELETE_COMPACT 2 -#define FULL_GROUP_NUM_DELETE_DENSE 16 +#define FULL_GROUP_NUM_DELETE_DENSE 16 +#define FULL_GROUP_EST_NUM_ENTRIES 8 +#define FULL_GROUP_EST_ENTRY_LEN 9 /*------------------------------------------------------------------------- @@ -104,38 +106,35 @@ test_one(hid_t file) herr_t status; /* Create a test group */ - if ((work=H5Gcreate(file, "/test_one", 0))<0) goto error; + if((work=H5Gcreate(file, "/test_one", (size_t)0)) < 0) goto error; /* Delete by absolute name */ TESTING("unlink by absolute name"); - if ((grp=H5Gcreate(work, "foo", 0))<0) goto error; - if (H5Gclose(grp)<0) goto error; - if (H5Gunlink(file, "/test_one/foo")<0) goto error; + if((grp=H5Gcreate(work, "foo", (size_t)0)) < 0) TEST_ERROR + if(H5Gclose(grp) < 0) TEST_ERROR + if(H5Gunlink(file, "/test_one/foo") < 0) TEST_ERROR PASSED(); /* Delete by local name */ TESTING("unlink by local name"); - if ((grp=H5Gcreate(work, "foo", 0))<0) goto error; - if (H5Gclose(grp)<0) goto error; - if (H5Gunlink(work, "foo")<0) goto error; + if((grp=H5Gcreate(work, "foo", (size_t)0)) < 0) TEST_ERROR + if(H5Gclose(grp) < 0) TEST_ERROR + if(H5Gunlink(work, "foo") < 0) TEST_ERROR PASSED(); /* Delete directly - should fail */ TESTING("unlink without a name"); - if ((grp=H5Gcreate(work, "foo", 0))<0) goto error; + if((grp=H5Gcreate(work, "foo", (size_t)0)) < 0) TEST_ERROR H5E_BEGIN_TRY { status = H5Gunlink(grp, "."); } H5E_END_TRY; - if (status>=0) { - H5_FAILED(); - puts(" Unlinking object w/o a name should have failed."); - goto error; - } - if (H5Gclose(grp)<0) goto error; + if(status>=0) + FAIL_PUTS_ERROR(" Unlinking object w/o a name should have failed.") + if(H5Gclose(grp) < 0) TEST_ERROR PASSED(); /* Cleanup */ - if (H5Gclose(work)<0) goto error; + if(H5Gclose(work) < 0) goto error; return 0; error: @@ -172,19 +171,19 @@ test_many(hid_t file) char name[32]; /* Create a test group */ - if ((work=H5Gcreate(file, "/test_many", 0))<0) goto error; - if ((grp = H5Gcreate(work, "/test_many_foo", 0))<0) goto error; - if (H5Gclose(grp)<0) goto error; + if((work=H5Gcreate(file, "/test_many", (size_t)0)) < 0) goto error; + if((grp = H5Gcreate(work, "/test_many_foo", (size_t)0)) < 0) goto error; + if(H5Gclose(grp) < 0) goto error; /* Create a bunch of names and unlink them in order */ TESTING("forward unlink"); for (i=0; i<how_many; i++) { sprintf(name, "obj_%05d", i); - if (H5Glink(work, H5L_LINK_HARD, "/test_many_foo", name)<0) goto error; + if (H5Glink(work, H5L_TYPE_HARD, "/test_many_foo", name) < 0) TEST_ERROR } for (i=0; i<how_many; i++) { sprintf(name, "obj_%05d", i); - if (H5Gunlink(work, name)<0) goto error; + if (H5Gunlink(work, name) < 0) TEST_ERROR } PASSED(); @@ -192,11 +191,11 @@ test_many(hid_t file) TESTING("backward unlink"); for (i=0; i<how_many; i++) { sprintf(name, "obj_%05d", i); - if (H5Glink(work, H5L_LINK_HARD, "/test_many_foo", name)<0) goto error; + if (H5Glink(work, H5L_TYPE_HARD, "/test_many_foo", name) < 0) TEST_ERROR } for (i=how_many-1; i>=0; --i) { sprintf(name, "obj_%05d", i); - if (H5Gunlink(work, name)<0) goto error; + if (H5Gunlink(work, name) < 0) TEST_ERROR } PASSED(); @@ -204,7 +203,7 @@ test_many(hid_t file) TESTING("inward unlink"); for (i=0; i<how_many; i++) { sprintf(name, "obj_%05d", i); - if (H5Glink(work, H5L_LINK_HARD, "/test_many_foo", name)<0) goto error; + if (H5Glink(work, H5L_TYPE_HARD, "/test_many_foo", name) < 0) TEST_ERROR } for (i=0; i<how_many; i++) { if (i%2) { @@ -212,7 +211,7 @@ test_many(hid_t file) } else { sprintf(name, "obj_%05d", i/2); } - if (H5Gunlink(work, name)<0) goto error; + if (H5Gunlink(work, name) < 0) TEST_ERROR } PASSED(); @@ -220,7 +219,7 @@ test_many(hid_t file) TESTING("outward unlink"); for (i=0; i<how_many; i++) { sprintf(name, "obj_%05d", i); - if (H5Glink(work, H5L_LINK_HARD, "/test_many_foo", name)<0) goto error; + if (H5Glink(work, H5L_TYPE_HARD, "/test_many_foo", name) < 0) TEST_ERROR } for (i=how_many-1; i>=0; --i) { if (i%2) { @@ -228,13 +227,13 @@ test_many(hid_t file) } else { sprintf(name, "obj_%05d", i/2); } - if (H5Gunlink(work, name)<0) goto error; + if (H5Gunlink(work, name) < 0) TEST_ERROR } PASSED(); /* Cleanup */ - if (H5Gclose(work)<0) goto error; + if (H5Gclose(work) < 0) goto error; return 0; error: @@ -268,12 +267,12 @@ test_symlink(hid_t file) TESTING("symlink removal"); /* Create a test group and symlink */ - if ((work=H5Gcreate(file, "/test_symlink", 0))<0) TEST_ERROR; - if (H5Glink(work, H5L_LINK_SOFT, "link_value", "link")<0) TEST_ERROR; - if (H5Gunlink(work, "link")<0) TEST_ERROR; + if ((work=H5Gcreate(file, "/test_symlink", (size_t)0)) < 0) TEST_ERROR + if (H5Glink(work, H5L_TYPE_SOFT, "link_value", "link") < 0) TEST_ERROR + if (H5Gunlink(work, "link") < 0) TEST_ERROR /* Cleanup */ - if (H5Gclose(work)<0) TEST_ERROR; + if (H5Gclose(work) < 0) TEST_ERROR PASSED(); return 0; @@ -308,24 +307,24 @@ test_rename(hid_t file) /* Create a test group and rename something */ TESTING("object renaming"); - if ((work=H5Gcreate(file, "/test_rename", 0))<0) goto error; - if ((foo=H5Gcreate(work, "foo", 0))<0) goto error; - if (H5Gmove(work, "foo", "bar")<0) goto error; - if ((inner=H5Gcreate(foo, "inner", 0))<0) goto error; - if (H5Gclose(inner)<0) goto error; - if (H5Gclose(foo)<0) goto error; - if ((inner=H5Gopen(work, "bar/inner"))<0) goto error; - if (H5Gclose(inner)<0) goto error; + if ((work=H5Gcreate(file, "/test_rename", (size_t)0)) < 0) TEST_ERROR + if ((foo=H5Gcreate(work, "foo", (size_t)0)) < 0) TEST_ERROR + if (H5Gmove(work, "foo", "bar") < 0) TEST_ERROR + if ((inner=H5Gcreate(foo, "inner", (size_t)0)) < 0) TEST_ERROR + if (H5Gclose(inner) < 0) TEST_ERROR + if (H5Gclose(foo) < 0) TEST_ERROR + if ((inner=H5Gopen(work, "bar/inner")) < 0) TEST_ERROR + if (H5Gclose(inner) < 0) TEST_ERROR PASSED(); /* Try renaming a symlink */ TESTING("symlink renaming"); - if (H5Glink(work, H5L_LINK_SOFT, "link_value", "link_one")<0) goto error; - if (H5Gmove(work, "link_one", "link_two")<0) goto error; + if (H5Glink(work, H5L_TYPE_SOFT, "link_value", "link_one") < 0) TEST_ERROR + if (H5Gmove(work, "link_one", "link_two") < 0) TEST_ERROR PASSED(); /* Cleanup */ - if (H5Gclose(work)<0) goto error; + if (H5Gclose(work) < 0) goto error; return 0; error: @@ -355,61 +354,52 @@ test_rename(hid_t file) *------------------------------------------------------------------------- */ static int -test_new_move(void) +test_new_move(hid_t fapl) { - hid_t fapl, file_a, file_b=(-1); + hid_t file_a, file_b=(-1); hid_t grp_1=(-1), grp_2=(-1), grp_move=(-1), moved_grp=(-1); char filename[1024]; TESTING("new move"); /* Create a second file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if ((file_a=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) - goto error; + if((file_a = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR h5_fixname(FILENAME[2], fapl, filename, sizeof filename); - if ((file_b=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) - goto error; + if((file_b = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create groups in first file */ - if((grp_1=H5Gcreate(file_a, "group1", 0))<0) goto error; - if((grp_2=H5Gcreate(file_a, "group2", 0))<0) goto error; - if((grp_move=H5Gcreate(grp_1, "group_move", 0))<0) goto error; + if((grp_1 = H5Gcreate(file_a, "group1", (size_t)0)) < 0) TEST_ERROR + if((grp_2 = H5Gcreate(file_a, "group2", (size_t)0)) < 0) TEST_ERROR + if((grp_move = H5Gcreate(grp_1, "group_move", (size_t)0)) < 0) TEST_ERROR /* Create hard and soft links. */ - if(H5Glink2(grp_1, "group_move", H5L_LINK_HARD, H5G_SAME_LOC, "hard")<0) - goto error; - if(H5Glink2(grp_1, "/group1/group_move", H5L_LINK_SOFT, grp_2, "soft")<0) - goto error; + if(H5Glink2(grp_1, "group_move", H5L_TYPE_HARD, H5G_SAME_LOC, "hard") < 0) TEST_ERROR + if(H5Glink2(grp_1, "/group1/group_move", H5L_TYPE_SOFT, grp_2, "soft") < 0) TEST_ERROR /* Move a group within the file. Both of source and destination use * H5G_SAME_LOC. Should fail. */ H5E_BEGIN_TRY { - if(H5Gmove2(H5G_SAME_LOC, "group_move", H5G_SAME_LOC, "group_new_name") - !=FAIL) goto error; + if(H5Gmove2(H5G_SAME_LOC, "group_move", H5G_SAME_LOC, "group_new_name") !=FAIL) TEST_ERROR } H5E_END_TRY; /* Move a group across files. Should fail. */ H5E_BEGIN_TRY { - if(H5Gmove2(grp_1, "group_move", file_b, "group_new_name")!=FAIL) - goto error; + if(H5Gmove2(grp_1, "group_move", file_b, "group_new_name")!=FAIL) TEST_ERROR } H5E_END_TRY; /* Move a group across groups in the same file. */ - if(H5Gmove2(grp_1, "group_move", grp_2, "group_new_name")<0) - goto error; + if(H5Gmove2(grp_1, "group_move", grp_2, "group_new_name") < 0) TEST_ERROR /* Open the group just moved to the new location. */ - if((moved_grp = H5Gopen(grp_2, "group_new_name"))<0) - goto error; + if((moved_grp = H5Gopen(grp_2, "group_new_name")) < 0) TEST_ERROR - H5Gclose(grp_1); - H5Gclose(grp_2); - H5Gclose(grp_move); - H5Gclose(moved_grp); - H5Fclose(file_a); - H5Fclose(file_b); + if(H5Gclose(grp_1) < 0) TEST_ERROR + if(H5Gclose(grp_2) < 0) TEST_ERROR + if(H5Gclose(grp_move) < 0) TEST_ERROR + if(H5Gclose(moved_grp) < 0) TEST_ERROR + if(H5Fclose(file_a) < 0) TEST_ERROR + if(H5Fclose(file_b) < 0) TEST_ERROR PASSED(); return 0; @@ -444,9 +434,9 @@ test_new_move(void) *------------------------------------------------------------------------- */ static int -check_new_move(void) +check_new_move(hid_t fapl) { - hid_t fapl, file; + hid_t file; H5G_stat_t sb_hard1, sb_hard2; char filename[1024]; char linkval[1024]; @@ -454,43 +444,27 @@ check_new_move(void) TESTING("check new move function"); /* Open file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if ((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) { - goto error; - } + if((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR /* Get hard link info */ - if(H5Gget_objinfo(file, "/group2/group_new_name", TRUE, &sb_hard1)<0) - goto error; - if(H5Gget_objinfo(file, "/group1/hard", TRUE, &sb_hard2)<0) - goto error; + if(H5Gget_objinfo(file, "/group2/group_new_name", TRUE, &sb_hard1) < 0) TEST_ERROR + if(H5Gget_objinfo(file, "/group1/hard", TRUE, &sb_hard2) < 0) TEST_ERROR /* Check hard links */ - if(H5G_GROUP!=sb_hard1.type || H5G_GROUP!=sb_hard2.type) { - H5_FAILED(); - puts(" Unexpected object type, should have been a group"); - goto error; - } - if (HDmemcmp(&sb_hard1.objno, &sb_hard2.objno, sizeof(sb_hard1.objno))) { - H5_FAILED(); - puts(" Hard link test failed. Link seems not to point to the "); - puts(" expected file location."); - goto error; - } + if(H5G_GROUP!=sb_hard1.type || H5G_GROUP!=sb_hard2.type) + FAIL_PUTS_ERROR(" Unexpected object type, should have been a group") + if(HDmemcmp(&sb_hard1.objno, &sb_hard2.objno, sizeof(sb_hard1.objno))) + FAIL_PUTS_ERROR(" Hard link test failed. Link seems not to point to the expected file location.") /* Check soft links */ - if (H5Gget_linkval(file, "group2/soft", sizeof linkval, linkval)<0) { - goto error; - } - if (strcmp(linkval, "/group1/group_move")) { - H5_FAILED(); - puts(" Soft link test failed. Wrong link value"); - goto error; - } + if(H5Gget_linkval(file, "group2/soft", sizeof linkval, linkval) < 0) TEST_ERROR + if(HDstrcmp(linkval, "/group1/group_move")) + FAIL_PUTS_ERROR(" Soft link test failed. Wrong link value") /* Cleanup */ - if(H5Fclose(file)<0) goto error; + if(H5Fclose(file) < 0) TEST_ERROR + PASSED(); return 0; @@ -515,9 +489,8 @@ check_new_move(void) *------------------------------------------------------------------------- */ static int -test_filespace(void) +test_filespace(hid_t fapl) { - hid_t fapl; /* File access property list */ hid_t fapl_nocache; /* File access property list with raw data cache turned off */ hid_t contig_dcpl; /* Dataset creation property list for contiguous dataset */ hid_t early_chunk_dcpl; /* Dataset creation property list for chunked dataset & early allocation */ @@ -553,91 +526,90 @@ test_filespace(void) puts("Testing file space gets reused:"); /* Open file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[4], fapl, filename, sizeof filename); /* Create FAPL with raw data cache disabled */ /* Create file access property list with raw data cache disabled */ - if ((fapl_nocache=H5Pcopy(fapl))<0) TEST_ERROR; + if ((fapl_nocache=H5Pcopy(fapl)) < 0) TEST_ERROR /* Get the cache settings */ - if(H5Pget_cache(fapl_nocache,&mdc_nelmts,&rdcc_nelmts,&rdcc_nbytes,&rdcc_w0)<0) TEST_ERROR; + if(H5Pget_cache(fapl_nocache,&mdc_nelmts,&rdcc_nelmts,&rdcc_nbytes,&rdcc_w0) < 0) TEST_ERROR /* Disable the raw data cache */ rdcc_nelmts=0; rdcc_nbytes=0; - if(H5Pset_cache(fapl_nocache,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0)<0) TEST_ERROR; + if(H5Pset_cache(fapl_nocache,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0) < 0) TEST_ERROR /* Create empty file for size comparisons later */ /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of an empty file */ - if((empty_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((empty_size=h5_get_file_size(filename))==0) TEST_ERROR /* Create common objects for datasets */ /* Create dataset creation property list for contigous storage */ - if ((contig_dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) TEST_ERROR; + if ((contig_dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR /* Make certain that space is allocated early */ - if(H5Pset_alloc_time(contig_dcpl, H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR; + if(H5Pset_alloc_time(contig_dcpl, H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR /* Create dataset creation property list for chunked storage & early allocation */ - if ((early_chunk_dcpl=H5Pcopy(contig_dcpl))<0) TEST_ERROR; + if ((early_chunk_dcpl=H5Pcopy(contig_dcpl)) < 0) TEST_ERROR /* Set chunk dimensions */ - if(H5Pset_chunk(early_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) TEST_ERROR; + if(H5Pset_chunk(early_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) TEST_ERROR /* Create dataset creation property list for chunked storage & late allocation */ - if ((late_chunk_dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) TEST_ERROR; + if ((late_chunk_dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR /* Set chunk dimensions */ - if(H5Pset_chunk(late_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) TEST_ERROR; + if(H5Pset_chunk(late_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) TEST_ERROR /* Create dataset creation property list for compressed, chunked storage & early allocation */ - if ((comp_dcpl=H5Pcopy(early_chunk_dcpl))<0) TEST_ERROR; + if ((comp_dcpl=H5Pcopy(early_chunk_dcpl)) < 0) TEST_ERROR /* Enable compression & set level */ - if(H5Pset_deflate(comp_dcpl, FILESPACE_DEFLATE_LEVEL) < 0) TEST_ERROR; + if(H5Pset_deflate(comp_dcpl, FILESPACE_DEFLATE_LEVEL) < 0) TEST_ERROR /* Create dataset creation property list for compact storage */ - if ((compact_dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) TEST_ERROR; + if ((compact_dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR /* Set to compact storage */ - if(H5Pset_layout(compact_dcpl, H5D_COMPACT) < 0) TEST_ERROR; + if(H5Pset_layout(compact_dcpl, H5D_COMPACT) < 0) TEST_ERROR /* Create dataspace for datasets */ - if((space = H5Screate_simple(FILESPACE_NDIMS, dims, NULL))<0) TEST_ERROR; + if((space = H5Screate_simple(FILESPACE_NDIMS, dims, NULL)) < 0) TEST_ERROR /* Create buffer for writing dataset */ - if((data = HDmalloc(sizeof(int)*FILESPACE_DIM0*FILESPACE_DIM1*FILESPACE_DIM2))==NULL) TEST_ERROR; + if((data = HDmalloc(sizeof(int)*FILESPACE_DIM0*FILESPACE_DIM1*FILESPACE_DIM2))==NULL) TEST_ERROR /* Create single dataset (with contiguous storage & late allocation), remove it & verify file size */ TESTING(" contiguous dataset with late allocation"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -645,23 +617,23 @@ test_filespace(void) TESTING(" contiguous dataset with early allocation"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -669,23 +641,23 @@ test_filespace(void) TESTING(" chunked dataset with late allocation"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, late_chunk_dcpl))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, late_chunk_dcpl)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -693,23 +665,23 @@ test_filespace(void) TESTING(" chunked dataset with early allocation"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, early_chunk_dcpl))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, early_chunk_dcpl)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -717,23 +689,23 @@ test_filespace(void) TESTING(" compressed, chunked dataset"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -744,10 +716,10 @@ test_filespace(void) TESTING(" re-writing compressed, chunked dataset"); /* Create file (using FAPL with disabled raw data cache) */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_nocache))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_nocache)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl))<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl)) < 0) TEST_ERROR /* Alternate re-writing dataset with compressible & random data */ for(u=0; u<FILESPACE_REWRITE; u++) { @@ -756,30 +728,30 @@ test_filespace(void) *tmp_data++ = v*u; /* Write the buffer to the dataset */ - if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data)<0) TEST_ERROR; + if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR /* Set buffer to different random numbers each time */ for (v=0, tmp_data=data; v<(FILESPACE_DIM0*FILESPACE_DIM1*FILESPACE_DIM2); v++) *tmp_data++ = (int)HDrandom(); /* Write the buffer to the dataset */ - if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data)<0) TEST_ERROR; + if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR } /* end for */ /* Close dataset */ - if(H5Dclose (dataset)<0) TEST_ERROR; + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -787,23 +759,23 @@ test_filespace(void) TESTING(" compact dataset"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, compact_dcpl))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, compact_dcpl)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -814,59 +786,59 @@ test_filespace(void) TESTING(" object header continuations"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create datasets to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl))<0) TEST_ERROR; - if((dataset2 = H5Dcreate (file, DATASET2NAME, H5T_NATIVE_INT, space, contig_dcpl))<0) TEST_ERROR; + if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR + if((dataset2 = H5Dcreate(file, DATASET2NAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR /* Create a dataspace for the attributes */ - if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL))<0) TEST_ERROR; + if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) TEST_ERROR /* Alternate adding attributes to each one */ - for(u=0; u<FILESPACE_NATTR; u++) { + for(u = 0; u < FILESPACE_NATTR; u++) { /* Set the name of the attribute to create */ sprintf(objname,"%s %u",ATTRNAME,u); /* Create an attribute on the first dataset */ - if((attr = H5Acreate (dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT))<0) TEST_ERROR; + if((attr = H5Acreate(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) TEST_ERROR /* Don't worry about writing the attribute - it will have a fill value */ /* Close the attribute on the first dataset */ - if(H5Aclose (attr)<0) TEST_ERROR; + if(H5Aclose(attr) < 0) TEST_ERROR /* Create an attribute on the second dataset */ - if((attr = H5Acreate (dataset2, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT))<0) TEST_ERROR; + if((attr = H5Acreate(dataset2, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) TEST_ERROR /* Don't worry about writing the attribute - it will have a fill value */ /* Close the attribute on the second dataset */ - if(H5Aclose (attr)<0) TEST_ERROR; + if(H5Aclose(attr) < 0) TEST_ERROR /* Flush the file (to fix the sizes of object header buffers, etc) */ - if(H5Fflush(file,H5F_SCOPE_GLOBAL)<0) TEST_ERROR; + if(H5Fflush(file,H5F_SCOPE_GLOBAL) < 0) TEST_ERROR } /* end for */ /* Close the dataspace for the attributes */ - if(H5Sclose (attr_space)<0) TEST_ERROR; + if(H5Sclose(attr_space) < 0) TEST_ERROR /* Close datasets */ - if(H5Dclose (dataset)<0) TEST_ERROR; - if(H5Dclose (dataset2)<0) TEST_ERROR; + if(H5Dclose(dataset) < 0) TEST_ERROR + if(H5Dclose(dataset2) < 0) TEST_ERROR /* Remove the datasets */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; - if(H5Gunlink (file, DATASET2NAME)<0) TEST_ERROR; + if(H5Gunlink(file, DATASETNAME) < 0) TEST_ERROR + if(H5Gunlink(file, DATASET2NAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size = h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -874,26 +846,26 @@ test_filespace(void) TESTING(" named datatype"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create datatype to commit */ - if((type = H5Tcopy (H5T_NATIVE_INT))<0) TEST_ERROR; + if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR /* Create a single named datatype to remove */ - if(H5Tcommit (file, TYPENAME, type)<0) TEST_ERROR; - if(H5Tclose (type)<0) TEST_ERROR; + if(H5Tcommit (file, TYPENAME, type) < 0) TEST_ERROR + if(H5Tclose (type) < 0) TEST_ERROR /* Remove the named datatype */ - if(H5Gunlink (file, TYPENAME)<0) TEST_ERROR; + if(H5Gunlink (file, TYPENAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -901,23 +873,23 @@ test_filespace(void) TESTING(" single group"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single group to remove */ - if((group = H5Gcreate (file, GROUPNAME, 0))<0) TEST_ERROR; - if(H5Gclose (group)<0) TEST_ERROR; + if((group = H5Gcreate (file, GROUPNAME, (size_t)0)) < 0) TEST_ERROR + if(H5Gclose (group) < 0) TEST_ERROR /* Remove the group */ - if(H5Gunlink (file, GROUPNAME)<0) TEST_ERROR; + if(H5Gunlink (file, GROUPNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -925,32 +897,30 @@ test_filespace(void) TESTING(" multiple groups"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a many groups to remove */ - for(u=0; u<UNLINK_NGROUPS; u++) { - sprintf(objname,"%s %u",GROUPNAME,u); - if((group = H5Gcreate (file, objname, 0))<0) TEST_ERROR; - if(H5Gclose (group)<0) TEST_ERROR; + for(u = 0; u < UNLINK_NGROUPS; u++) { + sprintf(objname, "%s %u", GROUPNAME, u); + if((group = H5Gcreate(file, objname, (size_t)0)) < 0) TEST_ERROR + if(H5Gclose (group) < 0) TEST_ERROR } /* end for */ /* Remove the all the groups */ /* (Remove them in reverse order just to make file size calculation easier -QAK) */ - for(u=UNLINK_NGROUPS; u>0; u--) { - sprintf(objname,"%s %u",GROUPNAME,(u-1)); - if(H5Gunlink (file, objname)<0) TEST_ERROR; + for(u = UNLINK_NGROUPS; u > 0; u--) { + sprintf(objname, "%s %u", GROUPNAME, (u - 1)); + if(H5Gunlink(file, objname) < 0) TEST_ERROR } /* end for */ /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR -#ifdef H5_GROUP_REVISION /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size = h5_get_file_size(filename)) == 0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; -#endif /* H5_GROUP_REVISION */ + if(file_size != empty_size) TEST_ERROR PASSED(); @@ -958,28 +928,28 @@ test_filespace(void) TESTING(" simple group hierarchy"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a small group hierarchy to remove */ - if((group = H5Gcreate (file, GROUPNAME, 0))<0) TEST_ERROR; - if((group2 = H5Gcreate (group, GROUP2NAME, 0))<0) TEST_ERROR; - if(H5Gclose (group2)<0) TEST_ERROR; - if(H5Gclose (group)<0) TEST_ERROR; + if((group = H5Gcreate(file, GROUPNAME, (size_t)0)) < 0) TEST_ERROR + if((group2 = H5Gcreate (group, GROUP2NAME, (size_t)0)) < 0) TEST_ERROR + if(H5Gclose (group2) < 0) TEST_ERROR + if(H5Gclose (group) < 0) TEST_ERROR /* Remove the second group */ - if(H5Gunlink (file, GROUPNAME "/" GROUP2NAME)<0) TEST_ERROR; + if(H5Gunlink (file, GROUPNAME "/" GROUP2NAME) < 0) TEST_ERROR /* Remove the first group */ - if(H5Gunlink (file, GROUPNAME)<0) TEST_ERROR; + if(H5Gunlink (file, GROUPNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -987,34 +957,34 @@ test_filespace(void) TESTING(" complex group hierarchy"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a complex group hierarchy to remove */ for(u=0; u<FILESPACE_TOP_GROUPS; u++) { /* Create group */ sprintf(objname,"%s %u",GROUPNAME,u); - if((group = H5Gcreate (file, objname, 0))<0) TEST_ERROR; + if((group = H5Gcreate (file, objname, (size_t)0)) < 0) TEST_ERROR /* Create nested groups inside top groups */ for(v=0; v<FILESPACE_NESTED_GROUPS; v++) { /* Create group */ sprintf(objname,"%s %u",GROUP2NAME,v); - if((group2 = H5Gcreate (group, objname, 0))<0) TEST_ERROR; + if((group2 = H5Gcreate (group, objname, (size_t)0)) < 0) TEST_ERROR /* Create datasets inside nested groups */ for(w=0; w<FILESPACE_NDATASETS; w++) { /* Create & close a dataset */ sprintf(objname,"%s %u",DATASETNAME,w); - if((dataset = H5Dcreate (group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR } /* end for */ /* Close nested group */ - if(H5Gclose (group2)<0) TEST_ERROR; + if(H5Gclose (group2) < 0) TEST_ERROR } /* end for */ /* Close top group */ - if(H5Gclose (group)<0) TEST_ERROR; + if(H5Gclose (group) < 0) TEST_ERROR } /* end for */ /* Remove complex group hierarchy */ @@ -1022,47 +992,45 @@ test_filespace(void) for(u=FILESPACE_TOP_GROUPS; u>0; u--) { /* Open group */ sprintf(objname,"%s %u",GROUPNAME,(u-1)); - if((group = H5Gopen (file, objname))<0) TEST_ERROR; + if((group = H5Gopen (file, objname)) < 0) TEST_ERROR /* Open nested groups inside top groups */ for(v=0; v<FILESPACE_NESTED_GROUPS; v++) { /* Create group */ sprintf(objname,"%s %u",GROUP2NAME,v); - if((group2 = H5Gopen (group, objname))<0) TEST_ERROR; + if((group2 = H5Gopen (group, objname)) < 0) TEST_ERROR /* Remove datasets inside nested groups */ for(w=0; w<FILESPACE_NDATASETS; w++) { /* Remove dataset */ sprintf(objname,"%s %u",DATASETNAME,w); - if(H5Gunlink (group2, objname)<0) TEST_ERROR; + if(H5Gunlink (group2, objname) < 0) TEST_ERROR } /* end for */ /* Close nested group */ - if(H5Gclose (group2)<0) TEST_ERROR; + if(H5Gclose (group2) < 0) TEST_ERROR /* Remove nested group */ sprintf(objname,"%s %u",GROUP2NAME,v); - if(H5Gunlink (group, objname)<0) TEST_ERROR; + if(H5Gunlink (group, objname) < 0) TEST_ERROR } /* end for */ /* Close top group */ - if(H5Gclose (group)<0) TEST_ERROR; + if(H5Gclose (group) < 0) TEST_ERROR /* Remove top group */ sprintf(objname,"%s %u",GROUPNAME,(u-1)); - if(H5Gunlink (file, objname)<0) TEST_ERROR; + if(H5Gunlink (file, objname) < 0) TEST_ERROR } /* end for */ /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR -#ifdef H5_GROUP_REVISION /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; -#endif /* H5_GROUP_REVISION */ + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -1070,11 +1038,11 @@ test_filespace(void) TESTING(" duplicate dataset"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT))<0) TEST_ERROR; - if(H5Dclose (dataset)<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) TEST_ERROR + if(H5Dclose (dataset) < 0) TEST_ERROR /* Create another dataset with same name */ H5E_BEGIN_TRY { @@ -1082,20 +1050,20 @@ test_filespace(void) } H5E_END_TRY; if (dataset>=0) { H5Dclose(dataset); - TEST_ERROR; + TEST_ERROR } /* end if */ /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -1103,32 +1071,32 @@ test_filespace(void) TESTING(" duplicate group"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a single group to remove */ - if((group = H5Gcreate (file, GROUPNAME, 0))<0) TEST_ERROR; - if(H5Gclose (group)<0) TEST_ERROR; + if((group = H5Gcreate (file, GROUPNAME, (size_t)0)) < 0) TEST_ERROR + if(H5Gclose (group) < 0) TEST_ERROR /* Create another group with same name */ H5E_BEGIN_TRY { - group = H5Gcreate (file, GROUPNAME, 0); + group = H5Gcreate (file, GROUPNAME, (size_t)0); } H5E_END_TRY; if (group>=0) { H5Gclose(group); - TEST_ERROR; + TEST_ERROR } /* end if */ /* Remove the group */ - if(H5Gunlink (file, GROUPNAME)<0) TEST_ERROR; + if(H5Gunlink (file, GROUPNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -1136,36 +1104,36 @@ test_filespace(void) TESTING(" duplicate named datatype"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create datatype to commit */ - if((type = H5Tcopy (H5T_NATIVE_INT))<0) TEST_ERROR; + if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR /* Create a single named datatype to remove */ - if(H5Tcommit (file, TYPENAME, type)<0) TEST_ERROR; - if(H5Tclose (type)<0) TEST_ERROR; + if(H5Tcommit (file, TYPENAME, type) < 0) TEST_ERROR + if(H5Tclose (type) < 0) TEST_ERROR /* Create datatype to commit */ - if((type = H5Tcopy (H5T_NATIVE_INT))<0) TEST_ERROR; + if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR /* Create another named datatype with same name */ H5E_BEGIN_TRY { status = H5Tcommit (file, TYPENAME, type); } H5E_END_TRY; - if (status>=0) TEST_ERROR; - if(H5Tclose (type)<0) TEST_ERROR; + if (status>=0) TEST_ERROR + if(H5Tclose (type) < 0) TEST_ERROR /* Remove the named datatype */ - if(H5Gunlink (file, TYPENAME)<0) TEST_ERROR; + if(H5Gunlink (file, TYPENAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -1173,21 +1141,21 @@ test_filespace(void) TESTING(" duplicate attribute"); /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create datasets to remove */ - if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl))<0) TEST_ERROR; + if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR /* Create a dataspace for the attributes */ - if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL))<0) TEST_ERROR; + if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) TEST_ERROR /* Create an attribute on the dataset */ - if((attr = H5Acreate (dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT))<0) TEST_ERROR; + if((attr = H5Acreate (dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) TEST_ERROR /* Don't worry about writing the attribute - it will have a fill value */ /* Close the attribute on the dataset */ - if(H5Aclose (attr)<0) TEST_ERROR; + if(H5Aclose (attr) < 0) TEST_ERROR /* Create another attribute with same name */ H5E_BEGIN_TRY { @@ -1195,26 +1163,26 @@ test_filespace(void) } H5E_END_TRY; if (attr>=0) { H5Aclose(attr); - TEST_ERROR; + TEST_ERROR } /* end if */ /* Close the dataspace for the attributes */ - if(H5Sclose (attr_space)<0) TEST_ERROR; + if(H5Sclose (attr_space) < 0) TEST_ERROR /* Close dataset */ - if(H5Dclose (dataset)<0) TEST_ERROR; + if(H5Dclose (dataset) < 0) TEST_ERROR /* Remove the dataset */ - if(H5Gunlink (file, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR /* Close file */ - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Fclose(file) < 0) TEST_ERROR /* Get the size of the file */ - if((file_size=h5_get_file_size(filename))==0) TEST_ERROR; + if((file_size=h5_get_file_size(filename))==0) TEST_ERROR /* Verify the file is correct size */ - if(file_size!=empty_size) TEST_ERROR; + if(file_size!=empty_size) TEST_ERROR PASSED(); @@ -1224,16 +1192,15 @@ test_filespace(void) HDfree(data); /* Close property lists */ - if(H5Pclose(fapl)<0) TEST_ERROR; - if(H5Pclose(fapl_nocache)<0) TEST_ERROR; - if(H5Pclose(contig_dcpl)<0) TEST_ERROR; - if(H5Pclose(early_chunk_dcpl)<0) TEST_ERROR; - if(H5Pclose(late_chunk_dcpl)<0) TEST_ERROR; - if(H5Pclose(comp_dcpl)<0) TEST_ERROR; - if(H5Pclose(compact_dcpl)<0) TEST_ERROR; + if(H5Pclose(fapl_nocache) < 0) TEST_ERROR + if(H5Pclose(contig_dcpl) < 0) TEST_ERROR + if(H5Pclose(early_chunk_dcpl) < 0) TEST_ERROR + if(H5Pclose(late_chunk_dcpl) < 0) TEST_ERROR + if(H5Pclose(comp_dcpl) < 0) TEST_ERROR + if(H5Pclose(compact_dcpl) < 0) TEST_ERROR /* Close dataspace */ - if(H5Sclose(space)<0) TEST_ERROR; + if(H5Sclose(space) < 0) TEST_ERROR /* Indicate success */ /* Don't print final "PASSED", since we aren't on the correct line anymore */ @@ -1274,48 +1241,37 @@ static int test_create_unlink(const char *msg, hid_t fapl) /* Create file */ h5_fixname(FILENAME[3], fapl, filename, sizeof filename); - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) - { - H5_FAILED(); - puts(" Creating file failed"); - goto error; - } + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_PUTS_ERROR(" Creating file failed") /* Create a many groups to remove */ for(u=0; u<UNLINK_NGROUPS; u++) { sprintf(groupname,"%s %u",GROUPNAME,u); - if((group = H5Gcreate (file, groupname, 0))<0) - { + if((group = H5Gcreate (file, groupname, (size_t)0)) < 0) { H5_FAILED(); - printf("group %s creation failed\n",groupname); + printf("group %s creation failed\n", groupname); goto error; - } - if(H5Gclose (group)<0) - { + } /* end if */ + if(H5Gclose (group) < 0) { H5_FAILED(); - printf("closing group %s failed\n",groupname); + printf("closing group %s failed\n", groupname); goto error; - } + } /* end if */ } /* end for */ /* Remove the all the groups */ for(u=0; u<UNLINK_NGROUPS; u++) { sprintf(groupname,"%s %u",GROUPNAME,u); - if(H5Gunlink (file, groupname)<0) - { + if(H5Gunlink(file, groupname) < 0) { H5_FAILED(); - printf("Unlinking group %s failed\n",groupname); + printf("Unlinking group %s failed\n", groupname); goto error; - } + } /* end if */ } /* end for */ /* Close file */ - if(H5Fclose(file)<0) - { - H5_FAILED(); - printf("Closing file failed\n"); - goto error; - } + if(H5Fclose(file) < 0) + FAIL_PUTS_ERROR("Closing file failed") PASSED(); return 0; @@ -1341,9 +1297,8 @@ error: *------------------------------------------------------------------------- */ static int -test_link_slashes(void) +test_link_slashes(hid_t fapl) { - hid_t fapl; /* File access property list */ hid_t fid; /* File ID */ hid_t gid,gid2; /* Group ID */ char filename[1024]; @@ -1351,41 +1306,40 @@ test_link_slashes(void) TESTING("creating links with multiple slashes"); /* Create file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[5], fapl, filename, sizeof filename); /* Create a file */ - if((fid=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) TEST_ERROR; + if((fid=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR /* Create a group in the root group */ - if((gid = H5Gcreate(fid, SLASHES_GROUP_NAME, 0))<0) TEST_ERROR; + if((gid = H5Gcreate(fid, SLASHES_GROUP_NAME, (size_t)0)) < 0) TEST_ERROR /* Create a nested group in the root group */ - if((gid2 = H5Gcreate(gid, SLASHES_GROUP_NAME, 0))<0) TEST_ERROR; + if((gid2 = H5Gcreate(gid, SLASHES_GROUP_NAME, (size_t)0)) < 0) TEST_ERROR /* Close the nested group */ - if(H5Gclose(gid2)<0) TEST_ERROR; + if(H5Gclose(gid2) < 0) TEST_ERROR /* Create a hard link to the nested group */ - if(H5Glink2(gid, SLASHES_GROUP_NAME, H5L_LINK_HARD, H5G_SAME_LOC, SLASHES_HARDLINK_NAME)<0) TEST_ERROR; + if(H5Glink2(gid, SLASHES_GROUP_NAME, H5L_TYPE_HARD, H5G_SAME_LOC, SLASHES_HARDLINK_NAME) < 0) TEST_ERROR /* Create a soft link with a relative path to the nested group */ - if(H5Glink2(gid, SLASHES_GROUP_NAME, H5L_LINK_SOFT, H5G_SAME_LOC, SLASHES_SOFTLINK_NAME)<0) TEST_ERROR; + if(H5Glink2(gid, SLASHES_GROUP_NAME, H5L_TYPE_SOFT, H5G_SAME_LOC, SLASHES_SOFTLINK_NAME) < 0) TEST_ERROR /* Create a soft link with the full path to the nested group */ - if(H5Glink2(gid, "////"SLASHES_GROUP_NAME""SLASHES_GROUP_NAME, H5L_LINK_SOFT, H5G_SAME_LOC, SLASHES_SOFTLINK2_NAME)<0) TEST_ERROR; + if(H5Glink2(gid, "////"SLASHES_GROUP_NAME""SLASHES_GROUP_NAME, H5L_TYPE_SOFT, H5G_SAME_LOC, SLASHES_SOFTLINK2_NAME) < 0) TEST_ERROR /* Create a soft link to the root group */ - if(H5Glink2(gid, "////", H5L_LINK_SOFT, H5G_SAME_LOC, SLASHES_ROOTLINK_NAME)<0) TEST_ERROR; + if(H5Glink2(gid, "////", H5L_TYPE_SOFT, H5G_SAME_LOC, SLASHES_ROOTLINK_NAME) < 0) TEST_ERROR /* Close the group */ - if(H5Gclose(gid)<0) TEST_ERROR; + if(H5Gclose(gid) < 0) TEST_ERROR /* Create a hard link to the existing group */ - if(H5Glink2(fid, SLASHES_GROUP_NAME, H5L_LINK_HARD, H5G_SAME_LOC, SLASHES_HARDLINK_NAME)<0) TEST_ERROR; + if(H5Glink2(fid, SLASHES_GROUP_NAME, H5L_TYPE_HARD, H5G_SAME_LOC, SLASHES_HARDLINK_NAME) < 0) TEST_ERROR /* Close the file */ - if(H5Fclose(fid)<0) TEST_ERROR; + if(H5Fclose(fid) < 0) TEST_ERROR PASSED(); return 0; @@ -1411,9 +1365,8 @@ error: *------------------------------------------------------------------------- */ static int -test_unlink_slashes(void) +test_unlink_slashes(hid_t fapl) { - hid_t fapl; /* File access property list */ hid_t fid; /* File ID */ hid_t gid; /* Group ID */ char filename[1024]; @@ -1421,41 +1374,40 @@ test_unlink_slashes(void) TESTING("deleting links with multiple slashes"); /* Create file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[5], fapl, filename, sizeof filename); /* Open the file */ - if((fid=H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT))<0) TEST_ERROR; + if((fid=H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR /* Open the top level group */ - if((gid = H5Gopen(fid, SLASHES_GROUP_NAME))<0) TEST_ERROR; + if((gid = H5Gopen(fid, SLASHES_GROUP_NAME)) < 0) TEST_ERROR /* Delete the root link */ - if(H5Gunlink(gid,SLASHES_ROOTLINK_NAME)<0) TEST_ERROR; + if(H5Gunlink(gid,SLASHES_ROOTLINK_NAME) < 0) TEST_ERROR /* Delete the soft link with the full path */ - if(H5Gunlink(gid,SLASHES_SOFTLINK2_NAME)<0) TEST_ERROR; + if(H5Gunlink(gid,SLASHES_SOFTLINK2_NAME) < 0) TEST_ERROR /* Delete the soft link with the relative path */ - if(H5Gunlink(gid,SLASHES_SOFTLINK_NAME)<0) TEST_ERROR; + if(H5Gunlink(gid,SLASHES_SOFTLINK_NAME) < 0) TEST_ERROR /* Delete the hard link */ - if(H5Gunlink(gid,SLASHES_HARDLINK_NAME)<0) TEST_ERROR; + if(H5Gunlink(gid,SLASHES_HARDLINK_NAME) < 0) TEST_ERROR /* Delete the group itself */ - if(H5Gunlink(gid,SLASHES_GROUP_NAME)<0) TEST_ERROR; + if(H5Gunlink(gid,SLASHES_GROUP_NAME) < 0) TEST_ERROR /* Close the group */ - if(H5Gclose(gid)<0) TEST_ERROR; + if(H5Gclose(gid) < 0) TEST_ERROR /* Delete the hard link */ - if(H5Gunlink(fid,SLASHES_HARDLINK_NAME)<0) TEST_ERROR; + if(H5Gunlink(fid,SLASHES_HARDLINK_NAME) < 0) TEST_ERROR /* Delete the group itself */ - if(H5Gunlink(fid,SLASHES_GROUP_NAME)<0) TEST_ERROR; + if(H5Gunlink(fid,SLASHES_GROUP_NAME) < 0) TEST_ERROR /* Close the file */ - if(H5Fclose(fid)<0) TEST_ERROR; + if(H5Fclose(fid) < 0) TEST_ERROR PASSED(); return 0; @@ -1472,20 +1424,20 @@ static int delete_node (hid_t pid, hid_t id) char name[256]; /* Name of object to close */ /* Get the name of the object to delete */ - if(H5Iget_name(id, name, sizeof(name))<0) return (-1); + if(H5Iget_name(id, name, sizeof(name)) < 0) return (-1); /* Close the object */ - if(H5Gclose (id)<0) return(-1); + if(H5Gclose (id) < 0) return(-1); /* Unlink the object */ - if(H5Gunlink (pid, name)<0) return(-1); + if(H5Gunlink (pid, name) < 0) return(-1); /* If this object is the right-most child, try opening the previous object */ if(HDstrcmp(name,"/Zone81")==0) { hid_t gid; - if((gid = H5Gopen (pid, "/Zone80"))<0) return(-1); - if(H5Gclose(gid)<0) return(-1); + if((gid = H5Gopen (pid, "/Zone80")) < 0) return(-1); + if(H5Gclose(gid) < 0) return(-1); } /* end if */ /* Indicate success */ @@ -1522,29 +1474,29 @@ test_unlink_rightleaf(hid_t fid) /* Allocate space for the group IDs */ gids = (hid_t *) HDmalloc (ngroups * sizeof(hid_t)); - if(gids==NULL) TEST_ERROR; + if(gids==NULL) TEST_ERROR - if((rootid = H5Gopen (fid, "/"))<0) TEST_ERROR; + if((rootid = H5Gopen (fid, "/")) < 0) TEST_ERROR /* Create all the groups */ for (n = 0; n < ngroups; n++) { sprintf(name, "Zone%d", n + 1); - if((gids[n] = H5Gcreate (rootid, name, 0))<0) TEST_ERROR; + if((gids[n] = H5Gcreate (rootid, name, (size_t)0)) < 0) TEST_ERROR } /* end for */ /* Unlink & re-create each group */ for (n = 0; n < ngroups; n++) { - if(delete_node (rootid, gids[n])<0) TEST_ERROR; + if(delete_node (rootid, gids[n]) < 0) TEST_ERROR sprintf(name, "Zone%d", n + 1); - if((gids[n] = H5Gcreate (rootid, name, 0))<0) TEST_ERROR; + if((gids[n] = H5Gcreate (rootid, name, (size_t)0)) < 0) TEST_ERROR } /* end for */ /* Close all the groups */ for (n = 0; n < ngroups; n++) - if(H5Gclose(gids[n])<0) TEST_ERROR; + if(H5Gclose(gids[n]) < 0) TEST_ERROR /* Close root group ID */ - if(H5Gclose(rootid)<0) TEST_ERROR; + if(H5Gclose(rootid) < 0) TEST_ERROR /* Free memory */ HDfree(gids); @@ -1586,29 +1538,29 @@ test_unlink_rightnode(hid_t fid) /* Allocate space for the group IDs */ gids = (hid_t *) HDmalloc (ngroups * sizeof(hid_t)); - if(gids==NULL) TEST_ERROR; + if(gids==NULL) TEST_ERROR - if((rootid = H5Gopen (fid, "/"))<0) TEST_ERROR; + if((rootid = H5Gopen (fid, "/")) < 0) TEST_ERROR /* Create all the groups */ for (n = 0; n < ngroups; n++) { sprintf(name, "ZoneB%d", n + 1); - if((gids[n] = H5Gcreate (rootid, name, 0))<0) TEST_ERROR; + if((gids[n] = H5Gcreate (rootid, name, (size_t)0)) < 0) TEST_ERROR } /* end for */ /* Close all the groups */ for (n = 0; n < ngroups; n++) - if(H5Gclose(gids[n])<0) TEST_ERROR; + if(H5Gclose(gids[n]) < 0) TEST_ERROR /* Unlink specific objects to trigger deletion of right leaf in non-leaf node */ - if(H5Gunlink(fid,"/ZoneB77")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneB78")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneB79")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneB8")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneB80")<0) TEST_ERROR; + if(H5Gunlink(fid,"/ZoneB77") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneB78") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneB79") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneB8") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneB80") < 0) TEST_ERROR /* Close root group ID */ - if(H5Gclose(rootid)<0) TEST_ERROR; + if(H5Gclose(rootid) < 0) TEST_ERROR /* Free memory */ HDfree(gids); @@ -1650,172 +1602,172 @@ test_unlink_middlenode(hid_t fid) /* Allocate space for the group IDs */ gids = (hid_t *) HDmalloc (ngroups * sizeof(hid_t)); - if(gids==NULL) TEST_ERROR; + if(gids==NULL) TEST_ERROR - if((rootid = H5Gopen (fid, "/"))<0) TEST_ERROR; + if((rootid = H5Gopen (fid, "/")) < 0) TEST_ERROR /* Create all the groups */ for (n = 0; n < ngroups; n++) { sprintf(name, "ZoneC%d", n + 1); - if((gids[n] = H5Gcreate (rootid, name, 0))<0) TEST_ERROR; + if((gids[n] = H5Gcreate (rootid, name, (size_t)0)) < 0) TEST_ERROR } /* end for */ /* Close all the groups */ for (n = 0; n < ngroups; n++) - if(H5Gclose(gids[n])<0) TEST_ERROR; + if(H5Gclose(gids[n]) < 0) TEST_ERROR /* Unlink specific objects to trigger deletion of all leafs in "interior" non-leaf node */ - if(H5Gunlink(fid,"/ZoneC11")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC110")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC111")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC112")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC113")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC114")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC115")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC116")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC117")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC118")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC119")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC12")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC120")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC121")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC122")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC123")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC124")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC125")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC126")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC127")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC128")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC129")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC13")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC130")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC131")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC132")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC133")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC134")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC135")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC136")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC137")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC138")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC139")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC14")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC140")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC141")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC142")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC143")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC144")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC145")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC146")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC147")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC148")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC149")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC15")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC150")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC151")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC152")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC153")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC154")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC155")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC156")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC157")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC158")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC159")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC16")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC160")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC161")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC162")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC163")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC164")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC165")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC166")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC167")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC168")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC169")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC17")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC170")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC171")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC172")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC173")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC174")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC175")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC176")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC177")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC178")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC179")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC18")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC180")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC19")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC2")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC20")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC21")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC22")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC23")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC24")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC25")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC26")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC27")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC28")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC29")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC3")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC30")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC31")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC32")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC33")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC34")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC35")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC36")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC37")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC38")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC39")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC4")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC40")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC41")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC42")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC43")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC44")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC45")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC46")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC47")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC48")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC49")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC5")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC50")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC51")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC52")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC53")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC54")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC55")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC56")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC57")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC58")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC59")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC6")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC60")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC61")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC62")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC63")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC64")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC65")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC66")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC67")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC68")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC69")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC7")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC70")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC71")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC72")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC73")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC74")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC75")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC76")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC77")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC78")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC79")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC8")<0) TEST_ERROR; - if(H5Gunlink(fid,"/ZoneC80")<0) TEST_ERROR; + if(H5Gunlink(fid,"/ZoneC11") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC110") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC111") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC112") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC113") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC114") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC115") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC116") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC117") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC118") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC119") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC12") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC120") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC121") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC122") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC123") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC124") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC125") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC126") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC127") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC128") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC129") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC13") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC130") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC131") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC132") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC133") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC134") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC135") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC136") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC137") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC138") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC139") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC14") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC140") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC141") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC142") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC143") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC144") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC145") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC146") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC147") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC148") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC149") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC15") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC150") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC151") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC152") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC153") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC154") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC155") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC156") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC157") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC158") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC159") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC16") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC160") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC161") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC162") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC163") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC164") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC165") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC166") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC167") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC168") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC169") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC17") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC170") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC171") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC172") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC173") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC174") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC175") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC176") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC177") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC178") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC179") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC18") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC180") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC19") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC2") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC20") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC21") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC22") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC23") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC24") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC25") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC26") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC27") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC28") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC29") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC3") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC30") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC31") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC32") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC33") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC34") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC35") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC36") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC37") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC38") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC39") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC4") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC40") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC41") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC42") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC43") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC44") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC45") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC46") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC47") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC48") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC49") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC5") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC50") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC51") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC52") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC53") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC54") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC55") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC56") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC57") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC58") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC59") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC6") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC60") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC61") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC62") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC63") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC64") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC65") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC66") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC67") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC68") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC69") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC7") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC70") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC71") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC72") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC73") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC74") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC75") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC76") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC77") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC78") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC79") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC8") < 0) TEST_ERROR + if(H5Gunlink(fid,"/ZoneC80") < 0) TEST_ERROR /* Close root group ID */ - if(H5Gclose(rootid)<0) TEST_ERROR; + if(H5Gclose(rootid) < 0) TEST_ERROR /* Free memory */ HDfree(gids); @@ -1845,48 +1797,46 @@ error: *------------------------------------------------------------------------- */ static int -test_resurrect_dataset(void) +test_resurrect_dataset(hid_t fapl) { - hid_t f=-1, s=-1, d=-1, fapl=-1; + hid_t f=-1, s=-1, d=-1; char filename[1024]; TESTING("resurrecting dataset after deletion"); /* Create file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[6], fapl, filename, sizeof filename); /* Create the file */ - if((f = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if((f = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a dataset in the file */ - if((s = H5Screate(H5S_SCALAR))<0) TEST_ERROR; - if((d = H5Dcreate(f, DATASETNAME, H5T_NATIVE_INT, s, H5P_DEFAULT))<0) TEST_ERROR; - if(H5Sclose(s)<0) TEST_ERROR; + if((s = H5Screate(H5S_SCALAR)) < 0) TEST_ERROR + if((d = H5Dcreate(f, DATASETNAME, H5T_NATIVE_INT, s, H5P_DEFAULT)) < 0) TEST_ERROR + if(H5Sclose(s) < 0) TEST_ERROR /* Unlink the dataset while it's open (will mark it for deletion when closed) */ - if(H5Gunlink(f, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink(f, DATASETNAME) < 0) TEST_ERROR /* Check that dataset name is NULL */ - if(H5Iget_name(d, NULL, 0) != 0) TEST_ERROR; + if(H5Iget_name(d, NULL, (size_t)0) != 0) TEST_ERROR /* Re-link the dataset to the group hierarchy (shouldn't get deleted now) */ - if(H5Glink2(d, ".", H5L_LINK_HARD, f, DATASET2NAME)<0) TEST_ERROR; + if(H5Glink2(d, ".", H5L_TYPE_HARD, f, DATASET2NAME) < 0) TEST_ERROR /* Close things */ - if(H5Dclose(d)<0) TEST_ERROR; - if(H5Fclose(f)<0) TEST_ERROR; + if(H5Dclose(d) < 0) TEST_ERROR + if(H5Fclose(f) < 0) TEST_ERROR /* Re-open the file */ - if((f=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) TEST_ERROR; + if((f=H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR /* Attempt to open the dataset under the new name */ - if((d=H5Dopen(f,DATASET2NAME))<0) TEST_ERROR; + if((d=H5Dopen(f,DATASET2NAME)) < 0) TEST_ERROR /* Close things */ - if(H5Dclose(d)<0) TEST_ERROR; - if(H5Fclose(f)<0) TEST_ERROR; - if(H5Pclose(fapl)<0) TEST_ERROR; + if(H5Dclose(d) < 0) TEST_ERROR + if(H5Fclose(f) < 0) TEST_ERROR PASSED(); return 0; @@ -1896,7 +1846,6 @@ error: H5Sclose(s); H5Dclose(d); H5Fclose(f); - H5Pclose(fapl); } H5E_END_TRY; return 1; } /* end test_resurrect_dataset() */ @@ -1919,46 +1868,45 @@ error: *------------------------------------------------------------------------- */ static int -test_resurrect_datatype(void) +test_resurrect_datatype(hid_t fapl) { - hid_t file=-1, type=-1, fapl=-1; + hid_t file=-1, type=-1; char filename[1024]; TESTING("resurrecting datatype after deletion"); /* Create file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[7], fapl, filename, sizeof filename); /* Create the file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a named datatype in the file */ - if((type = H5Tcopy (H5T_NATIVE_INT))<0) TEST_ERROR; - if(H5Tcommit (file, TYPENAME, type)<0) TEST_ERROR; + if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR + if(H5Tcommit (file, TYPENAME, type) < 0) TEST_ERROR /* Unlink the datatype while it's open (will mark it for deletion when closed) */ - if(H5Gunlink(file, TYPENAME)<0) TEST_ERROR; + if(H5Gunlink(file, TYPENAME) < 0) TEST_ERROR /* Check that datatype name is NULL */ - if(H5Iget_name(type, NULL, 0) != 0) TEST_ERROR; + if(H5Iget_name(type, NULL, (size_t)0) != 0) TEST_ERROR /* Re-link the datatype to the group hierarchy (shouldn't get deleted now) */ - if(H5Glink2(type, ".", H5L_LINK_HARD, file, TYPE2NAME) < 0) TEST_ERROR; + if(H5Glink2(type, ".", H5L_TYPE_HARD, file, TYPE2NAME) < 0) TEST_ERROR /* Close things */ - if(H5Tclose(type)<0) TEST_ERROR; - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Tclose(type) < 0) TEST_ERROR + if(H5Fclose(file) < 0) TEST_ERROR /* Re-open the file */ - if((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) TEST_ERROR; + if((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR /* Attempt to open the datatype under the new name */ - if((type=H5Topen(file,TYPE2NAME))<0) TEST_ERROR; + if((type=H5Topen(file,TYPE2NAME)) < 0) TEST_ERROR /* Close things */ - if(H5Tclose(type)<0) TEST_ERROR; - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Tclose(type) < 0) TEST_ERROR + if(H5Fclose(file) < 0) TEST_ERROR PASSED(); return 0; @@ -1989,45 +1937,44 @@ error: *------------------------------------------------------------------------- */ static int -test_resurrect_group(void) +test_resurrect_group(hid_t fapl) { - hid_t file=-1, group=-1, fapl=-1; + hid_t file=-1, group=-1; char filename[1024]; TESTING("resurrecting group after deletion"); /* Create file */ - fapl = h5_fileaccess(); h5_fixname(FILENAME[8], fapl, filename, sizeof filename); /* Create the file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create a group in the file */ - if((group = H5Gcreate (file, GROUPNAME, 0))<0) TEST_ERROR; + if((group = H5Gcreate (file, GROUPNAME, (size_t)0)) < 0) TEST_ERROR /* Unlink the group while it's open (will mark it for deletion when closed) */ - if(H5Gunlink(file, GROUPNAME)<0) TEST_ERROR; + if(H5Gunlink(file, GROUPNAME) < 0) TEST_ERROR /* Check that group's name is NULL */ - if(H5Iget_name(group, NULL, 0) != 0) TEST_ERROR; + if(H5Iget_name(group, NULL, (size_t)0) != 0) TEST_ERROR /* Re-link the group into the group hierarchy (shouldn't get deleted now) */ - if(H5Glink2(group, ".", H5L_LINK_HARD, file, GROUP2NAME)<0) TEST_ERROR; + if(H5Glink2(group, ".", H5L_TYPE_HARD, file, GROUP2NAME) < 0) TEST_ERROR /* Close things */ - if(H5Gclose(group)<0) TEST_ERROR; - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Gclose(group) < 0) TEST_ERROR + if(H5Fclose(file) < 0) TEST_ERROR /* Re-open the file */ - if((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) TEST_ERROR; + if((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR /* Attempt to open the datatype under the new name */ - if((group=H5Gopen(file,GROUP2NAME))<0) TEST_ERROR; + if((group=H5Gopen(file,GROUP2NAME)) < 0) TEST_ERROR /* Close things */ - if(H5Gclose(group)<0) TEST_ERROR; - if(H5Fclose(file)<0) TEST_ERROR; + if(H5Gclose(group) < 0) TEST_ERROR + if(H5Fclose(file) < 0) TEST_ERROR PASSED(); return 0; @@ -2057,9 +2004,8 @@ error: *------------------------------------------------------------------------- */ static int -test_unlink_chunked_dataset(void) +test_unlink_chunked_dataset(hid_t fapl) { - hid_t fapl_id=-1; hid_t file_id=-1; hid_t dset_id=-1; hid_t space_id=-1; @@ -2072,50 +2018,46 @@ test_unlink_chunked_dataset(void) TESTING("unlinking chunked dataset"); /* Create file */ - fapl_id = h5_fileaccess(); - h5_fixname(FILENAME[9], fapl_id, filename, sizeof filename); + h5_fixname(FILENAME[9], fapl, filename, sizeof filename); /* Create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id))<0) TEST_ERROR; + if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create the dataspace */ - if((space_id=H5Screate_simple(FILESPACE_NDIMS,dims,max_dims))<0) TEST_ERROR; + if((space_id=H5Screate_simple(FILESPACE_NDIMS,dims,max_dims)) < 0) TEST_ERROR /* Create the dataset creation filter */ - if((dcpl_id=H5Pcreate(H5P_DATASET_CREATE))<0) TEST_ERROR; + if((dcpl_id=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR /* Set to chunked storage */ - if(H5Pset_chunk(dcpl_id,FILESPACE_NDIMS,chunk_dims)<0) TEST_ERROR; + if(H5Pset_chunk(dcpl_id,FILESPACE_NDIMS,chunk_dims) < 0) TEST_ERROR /* Set to early space allocation */ - if(H5Pset_alloc_time(dcpl_id,H5D_ALLOC_TIME_EARLY)<0) TEST_ERROR; + if(H5Pset_alloc_time(dcpl_id,H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR /* Create the dataset */ - if((dset_id = H5Dcreate(file_id,DATASETNAME,H5T_NATIVE_INT,space_id,dcpl_id))<0) TEST_ERROR; + if((dset_id = H5Dcreate(file_id,DATASETNAME,H5T_NATIVE_INT,space_id,dcpl_id)) < 0) TEST_ERROR /* Close the dataspace */ - if(H5Sclose(space_id)<0) TEST_ERROR; + if(H5Sclose(space_id) < 0) TEST_ERROR /* Close the dataset creation property list */ - if(H5Pclose(dcpl_id)<0) TEST_ERROR; + if(H5Pclose(dcpl_id) < 0) TEST_ERROR /* Close the dataset */ - if(H5Dclose(dset_id)<0) TEST_ERROR; + if(H5Dclose(dset_id) < 0) TEST_ERROR /* Close the file */ - if(H5Fclose(file_id)<0) TEST_ERROR; + if(H5Fclose(file_id) < 0) TEST_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id))<0) TEST_ERROR; + if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR /* Delete the dataset */ - if(H5Gunlink(file_id, DATASETNAME)<0) TEST_ERROR; + if(H5Gunlink(file_id, DATASETNAME) < 0) TEST_ERROR /* Close the file */ - if(H5Fclose(file_id)<0) TEST_ERROR; - - /* Close the file access property list */ - if(H5Pclose(fapl_id)<0) TEST_ERROR; + if(H5Fclose(file_id) < 0) TEST_ERROR PASSED(); return 0; @@ -2126,12 +2068,10 @@ error: H5Sclose(space_id); H5Dclose(dset_id); H5Fclose(file_id); - H5Pclose(fapl_id); } H5E_END_TRY; return 1; } /* end test_unlink_chunked_dataset() */ -#ifdef H5_GROUP_REVISION /*------------------------------------------------------------------------- * Function: test_full_group_compact @@ -2147,9 +2087,8 @@ error: *------------------------------------------------------------------------- */ static int -test_full_group_compact(void) +test_full_group_compact(hid_t fapl) { - hid_t fapl_id = -1; hid_t file_id = -1; hid_t gid = -1, gid2 = -1; /* Group IDs */ H5G_stat_t sb; /* Stat buffer for object */ @@ -2162,12 +2101,11 @@ test_full_group_compact(void) TESTING("unlinking non-empty compact group"); - /* Create file */ - fapl_id = h5_fileaccess(); - h5_fixname(FILENAME[10], fapl_id, filename, sizeof filename); + /* Create filename */ + h5_fixname(FILENAME[10], fapl, filename, sizeof filename); /* Create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id))<0) TEST_ERROR + if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create group to link objects to */ if((gid = H5Gcreate(file_id, "/keep", (size_t)0)) < 0) TEST_ERROR @@ -2189,22 +2127,22 @@ test_full_group_compact(void) if((keep_size = h5_get_file_size(filename)) == 0) TEST_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR + if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR /* Create group to delete */ - if((gid = H5Gcreate(file_id, "/delete", (size_t)0)) < 0) goto error; + if((gid = H5Gcreate(file_id, "/delete", (size_t)0)) < 0) TEST_ERROR /* Create external link (doesn't matter if it dangles) */ if(H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR /* Create soft link (doesn't matter if it dangles) */ - if(H5Glink2(file_id, "/foo", H5L_LINK_SOFT, gid, "soft") < 0) TEST_ERROR + if(H5Glink2(file_id, "/foo", H5L_TYPE_SOFT, gid, "soft") < 0) TEST_ERROR /* Create hard links to objects in group to keep */ for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { sprintf(objname, "/keep/keep %u\n", u); sprintf(objname2, "keep %u\n", u); - if(H5Glink2(file_id, objname, H5L_LINK_HARD, gid, objname2) < 0) TEST_ERROR + if(H5Glink2(file_id, objname, H5L_TYPE_HARD, gid, objname2) < 0) TEST_ERROR } /* end for */ /* Create several objects to delete */ @@ -2215,9 +2153,9 @@ test_full_group_compact(void) } /* end for */ /* Check on group's status */ - if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR; - if(H5G_has_links_test(gid, NULL) != TRUE) TEST_ERROR; - if(H5G_has_stab_test(gid) == TRUE) TEST_ERROR; + if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR + if(H5G_has_links_test(gid, NULL) != TRUE) TEST_ERROR + if(H5G_has_stab_test(gid) == TRUE) TEST_ERROR /* Close group with objects to delete */ if(H5Gclose(gid) < 0) TEST_ERROR @@ -2234,7 +2172,7 @@ test_full_group_compact(void) /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR + if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR /* Delete the full group */ if(H5Gunlink(file_id, "/delete") < 0) TEST_ERROR @@ -2255,9 +2193,6 @@ test_full_group_compact(void) /* Verify the file is correct size */ if(file_size != keep_size) TEST_ERROR - /* Close the file access property list */ - if(H5Pclose(fapl_id) < 0) TEST_ERROR - PASSED(); return 0; @@ -2266,7 +2201,6 @@ error: H5Gclose(gid2); H5Gclose(gid); H5Fclose(file_id); - H5Pclose(fapl_id); } H5E_END_TRY; return 1; } /* end test_full_group_compact() */ @@ -2286,25 +2220,26 @@ error: *------------------------------------------------------------------------- */ static int -test_full_group_dense(void) +test_full_group_dense(hid_t fapl) { - hid_t fapl_id = -1; hid_t file_id = -1; + hid_t gcpl = (-1); /* Group creation property list ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ H5G_stat_t sb; /* Stat buffer for object */ char objname[128]; /* Buffer for name of objects to create */ char objname2[128]; /* Buffer for name of objects to create */ char filename[1024]; /* Buffer for filename */ + off_t keep_size; /* Size of the file with objects to keep */ + off_t file_size; /* Size of each file created */ unsigned u; /* Local index variable */ TESTING("unlinking non-empty dense group"); - /* Create file */ - fapl_id = h5_fileaccess(); - h5_fixname(FILENAME[10], fapl_id, filename, sizeof filename); + /* Create filename */ + h5_fixname(FILENAME[10], fapl, filename, sizeof filename); /* Create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id))<0) TEST_ERROR + if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create group to link objects to */ if((gid = H5Gcreate(file_id, "/keep", (size_t)0)) < 0) TEST_ERROR @@ -2319,20 +2254,42 @@ test_full_group_dense(void) /* Close group with objects to keep */ if(H5Gclose(gid) < 0) TEST_ERROR + /* Close the file */ + if(H5Fclose(file_id) < 0) TEST_ERROR + + /* Get the size of the file with only the objects to keep */ + if((keep_size = h5_get_file_size(filename)) == 0) TEST_ERROR + + /* Re-open the file */ + if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR + + /* Set group creation "est. link info" closer to what will actually occur */ + if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) TEST_ERROR + if(H5Pset_est_link_info(gcpl, FULL_GROUP_EST_NUM_ENTRIES, FULL_GROUP_EST_ENTRY_LEN) < 0) TEST_ERROR + /* Create group to delete */ - if((gid = H5Gcreate(file_id, "/delete", (size_t)0)) < 0) goto error; + /* (use non-default GCPL, in order to make certain that the group's object + * header is large enough to hold the links inserted without allocating + * another object header message chunk - in order to make the file size + * computation below easier/correct - QAK) + */ + if((gid = H5Gcreate_expand(file_id, gcpl, H5P_DEFAULT)) < 0) TEST_ERROR + if(H5Llink(file_id, "/delete", gid, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + + /* Close GCPL */ + if(H5Pclose(gcpl) < 0) TEST_ERROR /* Create external link (doesn't matter if it dangles) */ if(H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR /* Create soft link (doesn't matter if it dangles) */ - if(H5Glink2(file_id, "/foo", H5L_LINK_SOFT, gid, "soft") < 0) TEST_ERROR + if(H5Glink2(file_id, "/foo", H5L_TYPE_SOFT, gid, "soft") < 0) TEST_ERROR /* Create hard links to objects in group to keep */ for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { sprintf(objname, "/keep/keep %u\n", u); sprintf(objname2, "keep %u\n", u); - if(H5Glink2(file_id, objname, H5L_LINK_HARD, gid, objname2) < 0) TEST_ERROR + if(H5Glink2(file_id, objname, H5L_TYPE_HARD, gid, objname2) < 0) TEST_ERROR } /* end for */ /* Create several objects to delete */ @@ -2343,9 +2300,9 @@ test_full_group_dense(void) } /* end for */ /* Check on group's status */ - if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR; - if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR; - if(H5G_has_stab_test(gid) != TRUE) TEST_ERROR; + if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR + if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR + if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR /* Close group with objects to delete */ if(H5Gclose(gid) < 0) TEST_ERROR @@ -2362,7 +2319,7 @@ test_full_group_dense(void) /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR + if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR /* Delete the full group */ if(H5Gunlink(file_id, "/delete") < 0) TEST_ERROR @@ -2377,8 +2334,11 @@ test_full_group_dense(void) /* Close the file */ if(H5Fclose(file_id) < 0) TEST_ERROR - /* Close the file access property list */ - if(H5Pclose(fapl_id) < 0) TEST_ERROR + /* Get the size of the file */ + if((file_size = h5_get_file_size(filename)) == 0) TEST_ERROR + + /* Verify the file is correct size */ + if(file_size != keep_size) TEST_ERROR PASSED(); return 0; @@ -2387,12 +2347,11 @@ error: H5E_BEGIN_TRY { H5Gclose(gid2); H5Gclose(gid); + H5Pclose(gcpl); H5Fclose(file_id); - H5Pclose(fapl_id); } H5E_END_TRY; return 1; } /* end test_full_group_dense() */ -#endif /* H5_GROUP_REVISION */ /*------------------------------------------------------------------------- @@ -2414,16 +2373,18 @@ error: int main(void) { - hid_t fapl, fapl2, file; - int nerrors = 0; - char filename[1024]; const char *envval = NULL; /* Don't run this test using the wrong file drivers */ envval = HDgetenv("HDF5_DRIVER"); - if (envval == NULL) + if(envval == NULL) envval = "nomatch"; - if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) { + if(HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) { + hid_t fapl, fapl2, file; + int nerrors = 0; + char filename[1024]; + hbool_t new_format; + /* Metadata cache parameters */ int mdc_nelmts; size_t rdcc_nelmts; @@ -2436,61 +2397,95 @@ main(void) /* Open */ h5_reset(); fapl = h5_fileaccess(); - h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; - - /* Make copy of regular fapl, to turn down the elements in the metadata cache */ - if((fapl2=H5Pcopy(fapl))<0) - goto error; - - /* Get FAPL cache settings */ - if(H5Pget_cache(fapl2,&mdc_nelmts,&rdcc_nelmts,&rdcc_nbytes,&rdcc_w0)<0) - printf("H5Pget_cache failed\n"); - - /* Change FAPL cache settings */ - mdc_nelmts=1; - if(H5Pset_cache(fapl2,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0)<0) - printf("H5Pset_cache failed\n"); - - /* Tests */ - nerrors += test_one(file); - nerrors += test_many(file); - nerrors += test_symlink(file); - nerrors += test_rename(file); - nerrors += test_new_move(); - nerrors += check_new_move(); - nerrors += test_filespace(); - - /* Test creating & unlinking lots of objects with default FAPL */ - nerrors += test_create_unlink("create and unlink large number of objects",fapl); - /* Test creating & unlinking lots of objects with a 1-element metadata cache FAPL */ - nerrors += test_create_unlink("create and unlink large number of objects with small cache",fapl2); - - nerrors += test_link_slashes(); - nerrors += test_unlink_slashes(); - - /* Test specific B-tree removal issues */ - nerrors += test_unlink_rightleaf(file); - nerrors += test_unlink_rightnode(file); - nerrors += test_unlink_middlenode(file); - - /* Test "resurrecting" objects */ - nerrors += test_resurrect_dataset(); - nerrors += test_resurrect_datatype(); - nerrors += test_resurrect_group(); - - /* Test unlinking chunked datasets */ - nerrors += test_unlink_chunked_dataset(); - -#ifdef H5_GROUP_REVISION - /* Test unlinked groups which still have objects in them */ - nerrors += test_full_group_compact(); - nerrors += test_full_group_dense(); -#endif /* H5_GROUP_REVISION */ - - /* Close */ - if (H5Pclose(fapl2)<0) TEST_ERROR; - if (H5Fclose(file)<0) TEST_ERROR; + + /* Copy the file access property list */ + if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR + + /* Set the "use the latest version of the format" flag for creating objects in the file */ + if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR + + /* Test with old & new format groups */ + for(new_format = FALSE; new_format <= TRUE; new_format++) { + hid_t my_fapl; + + /* Set the FAPL for the type of format */ + if(new_format) { + puts("\nTesting with new group format:"); + my_fapl = fapl2; + } /* end if */ + else { + puts("Testing with old group format:"); + my_fapl = fapl; + } /* end else */ + + h5_fixname(FILENAME[0], my_fapl, filename, sizeof filename); + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0) TEST_ERROR + + /* Tests */ + nerrors += test_one(file); + nerrors += test_many(file); + nerrors += test_symlink(file); + nerrors += test_rename(file); + + nerrors += test_new_move(my_fapl); + nerrors += check_new_move(my_fapl); + nerrors += test_filespace(my_fapl); + + /* Test creating & unlinking lots of objects with default FAPL */ + nerrors += test_create_unlink("create and unlink large number of objects", my_fapl); + + { + hid_t fapl_small_mdc; + + /* Make copy of regular fapl, to turn down the elements in the metadata cache */ + if((fapl_small_mdc = H5Pcopy(my_fapl)) < 0) + goto error; + + /* Get FAPL cache settings */ + if(H5Pget_cache(fapl_small_mdc, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0) + printf("H5Pget_cache failed\n"); + + /* Change FAPL cache settings */ + mdc_nelmts=1; + if(H5Pset_cache(fapl_small_mdc, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0) + printf("H5Pset_cache failed\n"); + + /* Test creating & unlinking lots of objects with a 1-element metadata cache FAPL */ + nerrors += test_create_unlink("create and unlink large number of objects with small cache", fapl_small_mdc); + + if(H5Pclose(fapl_small_mdc) < 0) TEST_ERROR + } /* end block */ + + nerrors += test_link_slashes(my_fapl); + nerrors += test_unlink_slashes(my_fapl); + + /* Test specific B-tree removal issues */ + /* (only for old format groups) */ + if(!new_format) { + nerrors += test_unlink_rightleaf(file); + nerrors += test_unlink_rightnode(file); + nerrors += test_unlink_middlenode(file); + } /* end if */ + + /* Test "resurrecting" objects */ + nerrors += test_resurrect_dataset(my_fapl); + nerrors += test_resurrect_datatype(my_fapl); + nerrors += test_resurrect_group(my_fapl); + + /* Test unlinking chunked datasets */ + nerrors += test_unlink_chunked_dataset(my_fapl); + + /* Test unlinked groups which still have objects in them */ + /* (only for new format groups) */ + if(new_format) { + nerrors += test_full_group_compact(my_fapl); + nerrors += test_full_group_dense(my_fapl); + } /* end if */ + + /* Close */ + if(H5Fclose(file) < 0) TEST_ERROR + } /* end for */ + if (nerrors) { printf("***** %d FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S"); exit(1); @@ -2500,11 +2495,11 @@ main(void) h5_cleanup(FILENAME, fapl); } else - { puts("All unlink tests skipped - Incompatible with current Virtual File Driver"); - } + return 0; - error: - return 1; +error: + return 1; } + |