diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-01-14 23:49:12 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-01-14 23:49:12 (GMT) |
commit | 7fc10c0ea7e447408ccc747d16516b5505dcffa6 (patch) | |
tree | 127f1b52ed9d48dbbed16115ac40c7945fb35fe1 /test | |
parent | a6605796b3fe5d179e6e52f2fa7952666f8b93c4 (diff) | |
download | hdf5-7fc10c0ea7e447408ccc747d16516b5505dcffa6.zip hdf5-7fc10c0ea7e447408ccc747d16516b5505dcffa6.tar.gz hdf5-7fc10c0ea7e447408ccc747d16516b5505dcffa6.tar.bz2 |
[svn-r14413] Description:
Change H5P[gs]et_format_bounds() => H5P[gs]et_libver_bounds() and also
enumerated values H5F_FORMAT_{EARLIEST, LATEST} => H5F_LIBVER_{EARLIEST, LATEST}
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'test')
-rw-r--r-- | test/dsets.c | 2 | ||||
-rw-r--r-- | test/dtypes.c | 2 | ||||
-rw-r--r-- | test/fillval.c | 2 | ||||
-rw-r--r-- | test/gen_new_group.c | 2 | ||||
-rw-r--r-- | test/h5test.c | 2 | ||||
-rw-r--r-- | test/links.c | 2 | ||||
-rwxr-xr-x | test/objcopy.c | 2 | ||||
-rw-r--r-- | test/ohdr.c | 2 | ||||
-rw-r--r-- | test/stab.c | 2 | ||||
-rw-r--r-- | test/tattr.c | 12 | ||||
-rw-r--r-- | test/th5o.c | 8 | ||||
-rw-r--r-- | test/titerate.c | 4 | ||||
-rw-r--r-- | test/tmisc.c | 4 | ||||
-rw-r--r-- | test/unlink.c | 2 |
14 files changed, 24 insertions, 24 deletions
diff --git a/test/dsets.c b/test/dsets.c index 2b58110..797421f 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -6406,7 +6406,7 @@ main(void) if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) TEST_ERROR + if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR h5_fixname(FILENAME[0], fapl, filename, sizeof filename); diff --git a/test/dtypes.c b/test/dtypes.c index 4ee4eec..0388003 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -4413,7 +4413,7 @@ test_latest(void) /* Set the 'use the latest format' bounds in the FAPL */ if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) FAIL_STACK_ERROR - if(H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) + if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR /* Create file using default FAPL */ diff --git a/test/fillval.c b/test/fillval.c index 9018f62..2cf1191 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -2143,7 +2143,7 @@ main(int argc, char *argv[]) if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) TEST_ERROR + if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR /* Loop over using new group format */ for(new_format = FALSE; new_format <= TRUE; new_format++) { diff --git a/test/gen_new_group.c b/test/gen_new_group.c index d1f04e0..6d16031 100644 --- a/test/gen_new_group.c +++ b/test/gen_new_group.c @@ -58,7 +58,7 @@ int main(void) if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) goto error; /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) goto error; + if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) goto error; /* Create file for test groups */ if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) <0) goto error; diff --git a/test/h5test.c b/test/h5test.c index af9ca1e..6445ce6 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -599,7 +599,7 @@ h5_fileaccess(void) #endif } else if(!HDstrcmp(name, "latest")) { /* use the latest format */ - if(H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) + if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) return -1; } else { /* Unknown driver */ diff --git a/test/links.c b/test/links.c index 4e58500..1bff4c6 100644 --- a/test/links.c +++ b/test/links.c @@ -10212,7 +10212,7 @@ main(void) if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) TEST_ERROR + if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR /* Loop over using new group format */ for(new_format = FALSE; new_format <= TRUE; new_format++) { diff --git a/test/objcopy.c b/test/objcopy.c index eed7794..96e6954 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -7176,7 +7176,7 @@ main(void) if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) TEST_ERROR + if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR /* Create an FCPL with sharing enabled */ if((fcpl_shared = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR diff --git a/test/ohdr.c b/test/ohdr.c index 8ed361a..08fd860 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -89,7 +89,7 @@ main(void) HDputs("Using default file format:"); /* Set the format to use for the file */ - if (H5Pset_format_bounds(fapl, (b ? H5F_FORMAT_LATEST : H5F_FORMAT_EARLIEST), H5F_FORMAT_LATEST) < 0) FAIL_STACK_ERROR + if (H5Pset_libver_bounds(fapl, (b ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR /* Create the file to operate on */ if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR diff --git a/test/stab.c b/test/stab.c index 8b483c9..2b9a84d 100644 --- a/test/stab.c +++ b/test/stab.c @@ -1129,7 +1129,7 @@ main(void) if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) TEST_ERROR + if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR /* Loop over using new group format */ for(new_format = FALSE; new_format <= TRUE; new_format++) { diff --git a/test/tattr.c b/test/tattr.c index 99b1d65..d448397 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -2769,7 +2769,7 @@ test_attr_big(hid_t fcpl, hid_t fapl) unsigned max_compact; /* Maximum # of attributes to store compactly */ unsigned min_dense; /* Minimum # of attributes to store "densely" */ unsigned nshared_indices; /* # of shared message indices */ - H5F_format_version_t low, high; /* File format bounds */ + H5F_libver_t low, high; /* File format bounds */ htri_t is_empty; /* Are there any attributes? */ htri_t is_dense; /* Are attributes stored densely? */ unsigned u; /* Local index variable */ @@ -2818,8 +2818,8 @@ test_attr_big(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Pget_shared_mesg_nindexes"); /* Retrieve the format bounds for creating objects in the file */ - ret = H5Pget_format_bounds(fapl, &low, &high); - CHECK(ret, FAIL, "H5Pget_format_bounds"); + ret = H5Pget_libver_bounds(fapl, &low, &high); + CHECK(ret, FAIL, "H5Pget_libver_bounds"); /* Create a dataset */ dataset = H5Dcreate2(fid, DSET1_NAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); @@ -2881,7 +2881,7 @@ test_attr_big(hid_t fcpl, hid_t fapl) u = 2; sprintf(attrname, "attr %02u", u); attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, big_sid, H5P_DEFAULT, H5P_DEFAULT); - if(low == H5F_FORMAT_LATEST) { + if(low == H5F_LIBVER_LATEST) { CHECK(attr, FAIL, "H5Acreate2"); /* Close attribute */ @@ -8865,8 +8865,8 @@ test_attr(void) CHECK(fapl2, FAIL, "H5Pcopy"); /* Set the "use the latest version of the format" bounds for creating objects in the file */ - ret = H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST); - CHECK(ret, FAIL, "H5Pset_format_bounds"); + ret = H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); + CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* Create a default file creation property list */ fcpl = H5Pcreate(H5P_FILE_CREATE); diff --git a/test/th5o.c b/test/th5o.c index fec845d..e6071e9 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -582,8 +582,8 @@ test_h5o_plist(void) CHECK(fapl, FAIL, "H5Pcreate"); /* Set the "use the latest version of the format" bounds for creating objects in the file */ - ret = H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST); - CHECK(ret, FAIL, "H5Pset_format_bounds"); + ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); + CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* Create a new HDF5 file */ fid = H5Fcreate(TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); @@ -801,8 +801,8 @@ test_h5o_link(void) CHECK(fapl_id, FAIL, "H5Pcreate"); /* Set the "use the latest version of the format" bounds for creating objects in the file */ - ret = H5Pset_format_bounds(fapl_id, (new_format ? H5F_FORMAT_LATEST : H5F_FORMAT_EARLIEST), H5F_FORMAT_LATEST); - CHECK(ret, FAIL, "H5Pset_format_bounds"); + ret = H5Pset_libver_bounds(fapl_id, (new_format ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST); + CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* Create a new HDF5 file */ file_id = H5Fcreate(TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); diff --git a/test/titerate.c b/test/titerate.c index 63eb84f..d41df84 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -935,8 +935,8 @@ test_iterate(void) CHECK(fapl2, FAIL, "H5Pcopy"); /* Set the "use the latest version of the format" bounds for creating objects in the file */ - ret = H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST); - CHECK(ret, FAIL, "H5Pset_format_bounds"); + ret = H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); + CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* These next tests use the same file */ for(new_format = FALSE; new_format <= TRUE; new_format++) { diff --git a/test/tmisc.c b/test/tmisc.c index 915407c..7543ceb 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -4606,8 +4606,8 @@ test_misc25c(void) /* Compose file access property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); CHECK(fapl, FAIL, "H5Pcreate"); - ret = H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST); - CHECK(ret, FAIL, "H5Pset_format_bounds"); + ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); + CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* Create the file */ fid = H5Fcreate(MISC25C_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); diff --git a/test/unlink.c b/test/unlink.c index 235f763..868f765 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -2442,7 +2442,7 @@ main(void) if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_format_bounds(fapl2, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) TEST_ERROR + if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR /* Test with old & new format groups */ for(new_format = FALSE; new_format <= TRUE; new_format++) { |