diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2019-10-01 15:33:35 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2019-10-01 15:33:35 (GMT) |
| commit | 5c9c07b14943af0b8ae06a39a8e2725d8538741b (patch) | |
| tree | ba3b2ecbf5a18d3941b1395d316449b51279ef09 /test | |
| parent | 69e31596fffc44c9f89076164cd5fc64a5445a46 (diff) | |
| parent | 9ea386b6a660bd29225e96a246439db0c7f73da2 (diff) | |
| download | hdf5-5c9c07b14943af0b8ae06a39a8e2725d8538741b.zip hdf5-5c9c07b14943af0b8ae06a39a8e2725d8538741b.tar.gz hdf5-5c9c07b14943af0b8ae06a39a8e2725d8538741b.tar.bz2 | |
Merge pull request #1959 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/iteration_error_in_test_versionbounds to develop
* commit '9ea386b6a660bd29225e96a246439db0c7f73da2':
Fixed the iteration error in test_versionbounds() in test/dtypes.c.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dtypes.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index 4ccb951..98a3f87 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -7648,8 +7648,7 @@ test_versionbounds(void) H5F_t *filep = NULL; /* Pointer to internal structure of a file */ H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ - int i, j; /* Indices for iterating over versions */ - H5F_libver_t low, high; /* File format bounds */ + int low, high; /* Indices for iterating over versions */ H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, H5F_LIBVER_V114}; int versions_count = 5; /* Number of version bounds in the array */ unsigned highest_version; /* Highest version in nested datatypes */ @@ -7751,13 +7750,13 @@ test_versionbounds(void) skipping invalid combinations */ /* Create the file, create and write to a dataset with compound datatype */ /* Verify the dataset's datatype and its members */ - for(i = 0, low = versions[i]; i < versions_count; i++) { + for(low = 0; low < versions_count; low++) { - for(j = 0, high = versions[j]; j < versions_count; j++) { + for(high = 0; high < versions_count; high++) { /* Set version bounds */ H5E_BEGIN_TRY { - ret = H5Pset_libver_bounds(fapl, low, high); + ret = H5Pset_libver_bounds(fapl, versions[low], versions[high]); } H5E_END_TRY; if (ret < 0) /* Invalid low/high combinations */ @@ -7783,7 +7782,7 @@ test_versionbounds(void) highest_version = dtypep->shared->version; /* Verify version of the datatype recursevily */ - ret = verify_version(dset_dtype, low, &highest_version); + ret = verify_version(dset_dtype, versions[low], &highest_version); /* Close the dataset's datatype */ if (H5Tclose(dset_dtype) < 0) TEST_ERROR |