From 7fc10c0ea7e447408ccc747d16516b5505dcffa6 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 14 Jan 2008 18:49:12 -0500 Subject: [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 --- bin/trace | 2 +- src/H5Fpublic.h | 10 +++++----- src/H5Pfapl.c | 38 +++++++++++++++++++------------------- src/H5Ppublic.h | 8 ++++---- src/H5trace.c | 12 ++++++------ test/dsets.c | 2 +- test/dtypes.c | 2 +- test/fillval.c | 2 +- test/gen_new_group.c | 2 +- test/h5test.c | 2 +- test/links.c | 2 +- test/objcopy.c | 2 +- test/ohdr.c | 2 +- test/stab.c | 2 +- test/tattr.c | 12 ++++++------ test/th5o.c | 8 ++++---- test/titerate.c | 4 ++-- test/tmisc.c | 4 ++-- test/unlink.c | 2 +- tools/h5repack/h5repack_copy.c | 2 +- tools/h5stat/h5stat_gentest.c | 2 +- tools/misc/h5mkgrp.c | 2 +- 22 files changed, 62 insertions(+), 62 deletions(-) diff --git a/bin/trace b/bin/trace index 2f10232..db4e788 100755 --- a/bin/trace +++ b/bin/trace @@ -45,7 +45,7 @@ $Source = ""; "H5E_type_t" => "Et", "H5F_close_degree_t" => "Fd", "H5F_scope_t" => "Fs", - "H5F_format_version_t" => "Fv", + "H5F_libver_t" => "Fv", "H5G_obj_t" => "Go", "H5G_stat_t" => "Gs", "hsize_t" => "h", diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 0bbfbfb..a055d46 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -107,11 +107,11 @@ typedef struct H5F_info_t { } sohm; } H5F_info_t; -/* File format versions */ -typedef enum H5F_format_version_t { - H5F_FORMAT_EARLIEST, /* Use the earliest possible format for storing objects */ - H5F_FORMAT_LATEST /* Use the latest possible format available for storing objects*/ -} H5F_format_version_t; +/* Library's file format versions */ +typedef enum H5F_libver_t { + H5F_LIBVER_EARLIEST, /* Use the earliest possible format for storing objects */ + H5F_LIBVER_LATEST /* Use the latest possible format available for storing objects*/ +} H5F_libver_t; #ifdef __cplusplus extern "C" { diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 403e5bb..dd4a56f 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1876,7 +1876,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5Pset_format_bounds + * Function: H5Pset_libver_bounds * * Purpose: Indicates which versions of the file format the library should * use when creating objects. LOW is the earliest version of the HDF5 @@ -1915,7 +1915,7 @@ done: * Setting the LOW and HIGH values will not affect reading/writing existing * objects, only the creation of new objects. * - * Note: Eventually we want to add more values to the H5F_format_version_t + * Note: Eventually we want to add more values to the H5F_libver_t * enumerated type that indicate library release values where the file * format was changed (like "H5F_FORMAT_1_2_0" for the file format changes * in the 1.2.x release branch and possily even "H5F_FORMAT_1_4_2" for @@ -1962,41 +1962,41 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_format_bounds(hid_t plist_id, H5F_format_version_t low, - H5F_format_version_t high) +H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, + H5F_libver_t high) { H5P_genplist_t *plist; /* Property list pointer */ hbool_t latest; /* Whether to use the latest version or not */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER_API(H5Pset_format_bounds, FAIL) + FUNC_ENTER_API(H5Pset_libver_bounds, FAIL) H5TRACE3("e", "iFvFv", plist_id, low, high); /* Check args */ /* (Note that this is _really_ restricted right now, we'll want to loosen * this up more as we add features - QAK) */ - if(high != H5F_FORMAT_LATEST) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid high format bound") + if(high != H5F_LIBVER_LATEST) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid high library version bound") /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* Set values */ - latest = (low == H5F_FORMAT_LATEST) ? TRUE : FALSE; + latest = (low == H5F_LIBVER_LATEST) ? TRUE : FALSE; if(H5P_set(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set format bounds") + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set library version bounds") done: FUNC_LEAVE_API(ret_value) -} /* end H5Pset_format_bounds() */ +} /* end H5Pset_libver_bounds() */ /*------------------------------------------------------------------------- - * Function: H5Pget_format_bounds + * Function: H5Pget_libver_bounds * - * Purpose: Returns the current settings for the file format bounds + * Purpose: Returns the current settings for the library version format bounds * from a file access property list. * * Return: Non-negative on success/Negative on failure @@ -2007,14 +2007,14 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low/*out*/, - H5F_format_version_t *high/*out*/) +H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/, + H5F_libver_t *high/*out*/) { H5P_genplist_t *plist; /* Property list pointer */ hbool_t latest; /* Whether to use the latest version or not */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER_API(H5Pget_format_bounds, FAIL) + FUNC_ENTER_API(H5Pget_libver_bounds, FAIL) H5TRACE3("e", "ixx", plist_id, low, high); /* Get the plist structure */ @@ -2023,16 +2023,16 @@ H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low/*out*/, /* Get value */ if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get format bounds") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get library version bounds") /* Check for setting values to return */ /* (Again, this is restricted now, we'll need to open it up later -QAK) */ if(low) - *low = latest ? H5F_FORMAT_LATEST : H5F_FORMAT_EARLIEST; + *low = latest ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST; if(high) - *high = H5F_FORMAT_LATEST; + *high = H5F_LIBVER_LATEST; done: FUNC_LEAVE_API(ret_value) -} /* end H5Pget_format_bounds() */ +} /* end H5Pget_libver_bounds() */ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 784d15c..f102c80 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -265,10 +265,10 @@ H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size); H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/); H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size); H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/); -H5_DLL herr_t H5Pset_format_bounds(hid_t plist_id, H5F_format_version_t low, - H5F_format_version_t high); -H5_DLL herr_t H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low, - H5F_format_version_t *high); +H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, + H5F_libver_t high); +H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low, + H5F_libver_t *high); /* Dataset creation property list (DCPL) routines */ H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout); diff --git a/src/H5trace.c b/src/H5trace.c index c709e8a..926a590 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -654,14 +654,14 @@ H5_trace (const double *returning, const char *func, const char *type, ...) else fprintf(out, "NULL"); } else { - H5F_format_version_t format_vers = va_arg(ap, H5F_format_version_t); /*lint !e64 Type mismatch not really occuring */ + H5F_libver_t libver_vers = va_arg(ap, H5F_libver_t); /*lint !e64 Type mismatch not really occuring */ - switch(format_vers) { - case H5F_FORMAT_EARLIEST: - fprintf(out, "H5F_FORMAT_EARLIEST"); + switch(libver_vers) { + case H5F_LIBVER_EARLIEST: + fprintf(out, "H5F_LIBVER_EARLIEST"); break; - case H5F_FORMAT_LATEST: - fprintf(out, "H5F_FORMAT_LATEST"); + case H5F_LIBVER_LATEST: + fprintf(out, "H5F_LIBVER_LATEST"); break; } } 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++) { diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 870bcaa..01ccc21 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -176,7 +176,7 @@ int copy_objects(const char* fnamein, goto out; } /* end if */ - if(H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) { + if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { error_msg(progname, "Could not set property for using latest version of the format\n"); goto out; } /* end if */ diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c index bf10632..28d20ce 100644 --- a/tools/h5stat/h5stat_gentest.c +++ b/tools/h5stat/h5stat_gentest.c @@ -46,7 +46,7 @@ static void gen_file(void) char attrname[30]; fapl = H5Pcreate(H5P_FILE_ACCESS); - ret = H5Pset_format_bounds(fapl, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST); + ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); /* Create dataset */ file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c index 6de00f7..fbb6163 100644 --- a/tools/misc/h5mkgrp.c +++ b/tools/misc/h5mkgrp.c @@ -234,7 +234,7 @@ main(int argc, const char *argv[]) /* Check for creating groups with new format version */ if(params.latest) { /* Set the "use the latest version of the format" bounds */ - if(H5Pset_format_bounds(fapl_id, H5F_FORMAT_LATEST, H5F_FORMAT_LATEST) < 0) { + if(H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { error_msg(progname, "Could not set property for using latest version of the format\n"); leave(EXIT_FAILURE); } /* end if */ -- cgit v0.12