diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-06-27 14:45:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-06-27 14:45:06 (GMT) |
| commit | 7be3afb278aea67ba09a97f4b41c0aaaf5c47983 (patch) | |
| tree | 24ed86ab2a5c982fbf182d2ac8cd892c3813bc34 /test | |
| parent | 8d72542a50fac7a747fe0bfec8d2285de8efd29f (diff) | |
| download | hdf5-7be3afb278aea67ba09a97f4b41c0aaaf5c47983.zip hdf5-7be3afb278aea67ba09a97f4b41c0aaaf5c47983.tar.gz hdf5-7be3afb278aea67ba09a97f4b41c0aaaf5c47983.tar.bz2 | |
[svn-r12440] Purpose:
Code cleanup
Description:
Trim trailing whitespace in Makefile.am and C/C++ source files to make
diffing changes easier.
Platforms tested:
None necessary, whitespace only change
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/cache.c | 116 | ||||
| -rw-r--r-- | test/cache_api.c | 2 | ||||
| -rw-r--r-- | test/cache_common.c | 62 | ||||
| -rw-r--r-- | test/cache_common.h | 8 | ||||
| -rwxr-xr-x | test/cross_read.c | 4 | ||||
| -rw-r--r-- | test/dt_arith.c | 48 | ||||
| -rw-r--r-- | test/dtypes.c | 22 | ||||
| -rw-r--r-- | test/enum.c | 4 | ||||
| -rw-r--r-- | test/fheap.c | 38 | ||||
| -rw-r--r-- | test/h5test.c | 6 | ||||
| -rw-r--r-- | test/links.c | 2 | ||||
| -rwxr-xr-x | test/objcopy.c | 480 | ||||
| -rw-r--r-- | test/stab.c | 8 | ||||
| -rw-r--r-- | test/testframe.c | 4 | ||||
| -rw-r--r-- | test/tfile.c | 18 | ||||
| -rw-r--r-- | test/tselect.c | 152 | ||||
| -rw-r--r-- | test/ttsafe_acreate.c | 2 | ||||
| -rw-r--r-- | test/ttsafe_cancel.c | 4 | ||||
| -rw-r--r-- | test/tvltypes.c | 4 |
20 files changed, 493 insertions, 493 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 60d05c9..949c52f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -91,7 +91,7 @@ flush2.chkexe_: flush1.chkexe_ # Temporary files. These files are the ones created by setting the # HDF5_NOCLEANUP environment variable and running `make test' without # specifying a file prefix or low-level driver. Changing the file -# prefix or low-level driver with environment variables will influence +# prefix or low-level driver with environment variables will influence # the temporary file name in ways that the makefile is not aware of. CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5\ tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 stab[1-2].h5 \ diff --git a/test/cache.c b/test/cache.c index 68adc17..01859f1 100644 --- a/test/cache.c +++ b/test/cache.c @@ -3235,7 +3235,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3251,7 +3251,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 2, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, -1, -1, -1, -1, -1, -1}, @@ -3268,7 +3268,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 3, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1}, @@ -3397,7 +3397,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3413,7 +3413,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 2, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, -1, -1, -1, -1, -1, -1}, @@ -3430,7 +3430,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 3, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1}, @@ -3543,7 +3543,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3559,7 +3559,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3575,7 +3575,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3681,7 +3681,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3697,7 +3697,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3713,7 +3713,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3828,7 +3828,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3844,7 +3844,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3860,7 +3860,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3876,7 +3876,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3892,7 +3892,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ TRUE, @@ -3908,7 +3908,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ FALSE, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -3924,7 +3924,7 @@ check_flush_cache__multi_entry(H5C_t * cache_ptr) /* dirty_flag = */ TRUE, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, - /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, + /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, /* expected_loaded = */ FALSE, @@ -4259,8 +4259,8 @@ check_flush_cache__pe_multi_entry_test(H5C_t * cache_ptr, for ( j = 0; j < spec[i].num_pins; j++ ) { create_pinned_entry_dependency(cache_ptr, - spec[i].entry_type, - spec[i].entry_index, + spec[i].entry_type, + spec[i].entry_index, spec[i].pin_type[j], spec[i].pin_idx[j]); } @@ -5709,41 +5709,41 @@ check_flush_cache__single_entry(H5C_t * cache_ptr) * * This yields a total of 256 tests. * - * The tests and their expected results are given in the spec table + * The tests and their expected results are given in the spec table * below. The values assigned to the expected_cleared, expected_flushed, * and expected_destroyed fields are somewhat arcane, so the following * overview may be useful. * - * In addition to simply checking to see if the test case runs, + * In addition to simply checking to see if the test case runs, * we also check to see if the desired operations take place on the * cache entry. Thus expected_cleared is set to TRUE if we expect * the entry to be flushed, expected_flushed is set to TRUE if we * we expect the entry to be flushed, and expected_destroyed is set * to TRUE if we expect the entry to be destroyed. * - * In this test, we are working with pinned entries which can't be + * In this test, we are working with pinned entries which can't be * evicted, so expected_destroyed is always FALSE. We could pull it * from the table, but it is a hold over from the code this test * was adapted from, and it doesn't do any particular harm. * - * In general, we expect an entry to be flushed if it is dirty, and + * In general, we expect an entry to be flushed if it is dirty, and * flush in invoked WITHOUT the H5C__FLUSH_CLEAR_ONLY_FLAG. However, - * there are exceptions: If flush is invoked with the + * there are exceptions: If flush is invoked with the * H5C__FLUSH_MARKED_ENTRIES_FLAG, only marked entries will be flushed. * * Further, unprotecting an entry with the H5C__SET_FLUSH_MARKER_FLAG * will NOT mark the entry unless the entry has either been marked * dirty either before or durting the unprotect call. This results in - * some counterintuitive entries in the table. It make be useful to + * some counterintuitive entries in the table. It make be useful to * look in the test code to see the exact order of operations. - * - * Similarly, we expect an entry to be cleared if it is dirty, and + * + * Similarly, we expect an entry to be cleared if it is dirty, and * flush is invoked WITH the H5C__FLUSH_CLEAR_ONLY_FLAG. Again, there - * are exceptions -- If flush is also invoked with the + * are exceptions -- If flush is also invoked with the * H5C__FLUSH_MARKED_ENTRIES_FLAG, only the marked entries will be * cleared. - * - * The above comments about applying unprotect with the + * + * The above comments about applying unprotect with the * H5C__SET_FLUSH_MARKER_FLAG apply here as well. */ @@ -5766,7 +5766,7 @@ check_flush_cache__single_entry(H5C_t * cache_ptr) hbool_t expected_flushed; hbool_t expected_destroyed; } spec[256] = - /* pop pop + /* pop pop * ent mark mark * test entry -ry dirty mark dirty dirty unprot flush expect expect expect * num type idx flag dirty prot pinned unpin flags flags clear flush destroy @@ -6053,7 +6053,7 @@ check_flush_cache__single_entry(H5C_t * cache_ptr) } return; - + } /* check_flush_cache__single_entry() */ @@ -6247,8 +6247,8 @@ check_flush_cache__single_entry_test(H5C_t * cache_ptr, * Modifications: * * JRM -- 5/17/06 - * Added the pop_mark_dirty_prot and pop_mark_dirty_pinned - * flags and supporting code to allow us to test the + * Added the pop_mark_dirty_prot and pop_mark_dirty_pinned + * flags and supporting code to allow us to test the * H5C_mark_pinned_or_protected_entry_dirty() call. Use the * call to mark the entry dirty while the entry is protected * if pop_mark_dirty_prot is TRUE, and to mark the entry @@ -6316,8 +6316,8 @@ check_flush_cache__pinned_single_entry_test(H5C_t * cache_ptr, if ( pop_mark_dirty_prot ) { - mark_pinned_or_protected_entry_dirty(cache_ptr, - entry_type, + mark_pinned_or_protected_entry_dirty(cache_ptr, + entry_type, entry_idx); } @@ -6332,8 +6332,8 @@ check_flush_cache__pinned_single_entry_test(H5C_t * cache_ptr, if ( pop_mark_dirty_pinned ) { - mark_pinned_or_protected_entry_dirty(cache_ptr, - entry_type, + mark_pinned_or_protected_entry_dirty(cache_ptr, + entry_type, entry_idx); } } @@ -6653,7 +6653,7 @@ check_get_entry_status(void) /*------------------------------------------------------------------------- * Function: check_rename_entry() * - * Purpose: Verify that H5C_rename_entry behaves as expected. In + * Purpose: Verify that H5C_rename_entry behaves as expected. In * particular, verify that it works correctly with pinned * entries. * @@ -6706,7 +6706,7 @@ check_rename_entry(void) pass = TRUE; /* allocate a cache, load entries into it, and then rename - * them. To the extent possible, verify that the desired + * them. To the extent possible, verify that the desired * actions took place. * * At present, we should do the following tests: @@ -6766,7 +6766,7 @@ check_rename_entry(void) /*------------------------------------------------------------------------- * Function: check_rename_entry__run_test() * - * Purpose: Run a rename entry test. + * Purpose: Run a rename entry test. * * Do nothing if pass is FALSE on entry. * @@ -6828,7 +6828,7 @@ check_rename_entry__run_test(H5C_t * cache_ptr, "bad entry_ptr in rename test #%d.", test_num); failure_mssg = msg; - + } else if ( spec_ptr->is_pinned ) { flags |= H5C__PIN_ENTRY_FLAG; @@ -6868,7 +6868,7 @@ check_rename_entry__run_test(H5C_t * cache_ptr, ( test_ptr != (H5C_cache_entry_t *)entry_ptr ) ) { test_ptr = test_ptr->next; - } + } if ( test_ptr == NULL ) { @@ -7427,7 +7427,7 @@ check_double_pin_err(void) /* allocate a cache, protect an entry, unprotect it with the pin flag, * protect it again, and then try to unprotect it again with the pin - * flag. This should fail. Unpin the entry and destroy the cache + * flag. This should fail. Unpin the entry and destroy the cache * -- should succeed. */ @@ -7450,7 +7450,7 @@ check_double_pin_err(void) if ( pass ) { result = H5C_unprotect(NULL, -1, -1, cache_ptr, &(types[0]), - entry_ptr->addr, (void *)entry_ptr, + entry_ptr->addr, (void *)entry_ptr, H5C__PIN_ENTRY_FLAG, 0); if ( result > 0 ) { @@ -7486,7 +7486,7 @@ check_double_pin_err(void) /*------------------------------------------------------------------------- * Function: check_double_unpin_err() * - * Purpose: Verify that an attempt to unpin an unpinned entry will + * Purpose: Verify that an attempt to unpin an unpinned entry will * generate an error. * * Return: void @@ -7514,7 +7514,7 @@ check_double_unpin_err(void) pass = TRUE; /* allocate a cache, protect an entry, unprotect it with the unpin flag. - * -- This should fail. + * -- This should fail. * * Try again with H5C_unpin_entry -- this should also fail. * @@ -7536,7 +7536,7 @@ check_double_unpin_err(void) if ( pass ) { result = H5C_unprotect(NULL, -1, -1, cache_ptr, &(types[0]), - entry_ptr->addr, (void *)entry_ptr, + entry_ptr->addr, (void *)entry_ptr, H5C__UNPIN_ENTRY_FLAG, 0); if ( result > 0 ) { @@ -7613,10 +7613,10 @@ check_pin_entry_errs(void) pass = TRUE; /* Allocate a cache, protect an entry, unprotect it with no flags, - * and then call H5C_pin_protected_entry() to pin it -- This should fail. + * and then call H5C_pin_protected_entry() to pin it -- This should fail. * * Protect the entry again, unprotect it with a pin flag, protect it - * again, and then call H5C_pin_protected_entry() to pin it -- This + * again, and then call H5C_pin_protected_entry() to pin it -- This * should fail also. * * Unprotect the entry with the unpin flag. @@ -7791,7 +7791,7 @@ check_double_protect_err(void) * H5C_unprotect(). * * JRM -- 9/8/05 - * Updated function for the new size change parameter in + * Updated function for the new size change parameter in * H5C_unprotect(). We don't use them for now. * *------------------------------------------------------------------------- @@ -7831,7 +7831,7 @@ check_double_unprotect_err(void) if ( pass ) { result = H5C_unprotect(NULL, -1, -1, cache_ptr, &(types[0]), - entry_ptr->addr, (void *)entry_ptr, + entry_ptr->addr, (void *)entry_ptr, H5C__NO_FLAGS_SET, 0); if ( result > 0 ) { @@ -7872,7 +7872,7 @@ check_double_unprotect_err(void) * entry as the target will generate an error. * * 3) a call to H5C_mark_pinned_or_protected_entry_dirty with - * and unpinned and unprotected entry will generate an + * and unpinned and unprotected entry will generate an * error. * * Return: void @@ -7900,9 +7900,9 @@ check_mark_entry_dirty_errs(void) pass = TRUE; /* allocate a cache, protect an entry, and then attempt to mark it dirty - * with the H5C_mark_pinned_entry_dirty() call -- This should fail. + * with the H5C_mark_pinned_entry_dirty() call -- This should fail. * - * Then unprotect the entry without pinning it, and try to mark it dirty + * Then unprotect the entry without pinning it, and try to mark it dirty * again -- this should fail too. * * Try it again using H5C_mark_pinned_or_protected_entry_dirty -- this @@ -7960,7 +7960,7 @@ check_mark_entry_dirty_errs(void) if ( pass ) { - result = H5C_mark_pinned_or_protected_entry_dirty(cache_ptr, + result = H5C_mark_pinned_or_protected_entry_dirty(cache_ptr, (void *)entry_ptr); diff --git a/test/cache_api.c b/test/cache_api.c index c1089dd..f303601 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -15,7 +15,7 @@ /* Programmer: John Mainzer * 11/10/05 * - * This file contains tests for the API calls associated + * This file contains tests for the API calls associated * with the cache implemented in H5C.c */ diff --git a/test/cache_common.c b/test/cache_common.c index aeb9a25..ad5fe12 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -15,7 +15,7 @@ /* Programmer: John Mainzer * 10/27/05 * - * This file contains common code for tests of the cache + * This file contains common code for tests of the cache * implemented in H5C.c */ #include "h5test.h" @@ -548,11 +548,11 @@ destroy(H5F_t UNUSED * f, pinned_base_addr = entries[entry_ptr->pin_type[i]]; pinned_entry_ptr = &(pinned_base_addr[entry_ptr->pin_idx[i]]); - HDassert( 0 <= pinned_entry_ptr->type ); + HDassert( 0 <= pinned_entry_ptr->type ); HDassert( pinned_entry_ptr->type < NUMBER_OF_ENTRY_TYPES ); HDassert( pinned_entry_ptr->type == entry_ptr->pin_type[i] ); HDassert( pinned_entry_ptr->index >= 0 ); - HDassert( pinned_entry_ptr->index <= + HDassert( pinned_entry_ptr->index <= max_indices[pinned_entry_ptr->type] ); HDassert( pinned_entry_ptr->index == entry_ptr->pin_idx[i] ); HDassert( pinned_entry_ptr == pinned_entry_ptr->self ); @@ -564,7 +564,7 @@ destroy(H5F_t UNUSED * f, if ( pinned_entry_ptr->pinning_ref_count <= 0 ) { - unpin_entry(pinned_entry_ptr->cache_ptr, + unpin_entry(pinned_entry_ptr->cache_ptr, pinned_entry_ptr->type, pinned_entry_ptr->index); } @@ -1015,12 +1015,12 @@ monster_size(H5F_t * f, void * thing, size_t * size_ptr) * * Purpose: Do noting if pass is FALSE on entry. * - * Otherwise, set up a pinned entry dependency so we can + * Otherwise, set up a pinned entry dependency so we can * test the pinned entry modifications to the flush routine. * * Given the types and indicies of the pinned and pinning * entries, add the pinned entry to the list of pinned - * entries in the pinning entry, increment the + * entries in the pinning entry, increment the * pinning reference count of the pinned entry, and * if that count was zero initially, pin the entry. * @@ -1048,13 +1048,13 @@ create_pinned_entry_dependency(H5C_t * cache_ptr, if ( pass ) { - HDassert( ( 0 <= pinning_type ) && + HDassert( ( 0 <= pinning_type ) && ( pinning_type < NUMBER_OF_ENTRY_TYPES ) ); - HDassert( ( 0 <= pinning_idx ) && + HDassert( ( 0 <= pinning_idx ) && ( pinning_idx <= max_indices[pinning_type] ) ); - HDassert( ( 0 <= pinned_type ) && + HDassert( ( 0 <= pinned_type ) && ( pinned_type < NUMBER_OF_ENTRY_TYPES ) ); - HDassert( ( 0 <= pinned_idx ) && + HDassert( ( 0 <= pinned_idx ) && ( pinned_idx <= max_indices[pinned_type] ) ); pinning_base_addr = entries[pinning_type]; @@ -1080,7 +1080,7 @@ create_pinned_entry_dependency(H5C_t * cache_ptr, if ( pinned_entry_ptr->pinning_ref_count == 0 ) { protect_entry(cache_ptr, pinned_type, pinned_idx); - unprotect_entry(cache_ptr, pinned_type, pinned_idx, FALSE, + unprotect_entry(cache_ptr, pinned_type, pinned_idx, FALSE, H5C__PIN_ENTRY_FLAG); } @@ -1585,7 +1585,7 @@ insert_entry(H5C_t * cache_ptr, HDfprintf(stdout, "result = %d\n", (int)result); HDfprintf(stdout, "entry_ptr->header.is_protected = %d\n", (int)(entry_ptr->header.is_protected)); - HDfprintf(stdout, + HDfprintf(stdout, "entry_ptr->header.type != &(types[type]) = %d\n", (int)(entry_ptr->header.type != &(types[type]))); HDfprintf(stdout, @@ -1612,7 +1612,7 @@ insert_entry(H5C_t * cache_ptr, /*------------------------------------------------------------------------- * Function: mark_pinned_entry_dirty() * - * Purpose: Mark the specified entry as dirty. + * Purpose: Mark the specified entry as dirty. * * Do nothing if pass is FALSE on entry. * @@ -1659,7 +1659,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr, entry_ptr->is_dirty = TRUE; - result = H5C_mark_pinned_entry_dirty(cache_ptr, + result = H5C_mark_pinned_entry_dirty(cache_ptr, (void *)entry_ptr, size_changed, new_size); @@ -1688,7 +1688,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr, /*------------------------------------------------------------------------- * Function: mark_pinned_or_protected_entry_dirty() * - * Purpose: Mark the specified entry as dirty. + * Purpose: Mark the specified entry as dirty. * * Do nothing if pass is FALSE on entry. * @@ -1727,39 +1727,39 @@ mark_pinned_or_protected_entry_dirty(H5C_t * cache_ptr, HDassert( entry_ptr->type == type ); HDassert( entry_ptr == entry_ptr->self ); HDassert( entry_ptr->cache_ptr == cache_ptr ); - HDassert( entry_ptr->header.is_protected || + HDassert( entry_ptr->header.is_protected || entry_ptr->header.is_pinned ); entry_ptr->is_dirty = TRUE; - result = H5C_mark_pinned_or_protected_entry_dirty(cache_ptr, + result = H5C_mark_pinned_or_protected_entry_dirty(cache_ptr, (void *)entry_ptr); - if ( ( result < 0 ) + if ( ( result < 0 ) || - ( ( ! (entry_ptr->header.is_protected) ) + ( ( ! (entry_ptr->header.is_protected) ) && - ( ! (entry_ptr->header.is_pinned) ) - ) + ( ! (entry_ptr->header.is_pinned) ) + ) || - ( ( entry_ptr->header.is_protected ) - && - ( ! ( entry_ptr->header.dirtied ) ) + ( ( entry_ptr->header.is_protected ) + && + ( ! ( entry_ptr->header.dirtied ) ) ) || ( ( ! ( entry_ptr->header.is_protected ) ) - && - ( ! ( entry_ptr->header.is_dirty ) ) + && + ( ! ( entry_ptr->header.is_dirty ) ) ) || - ( entry_ptr->header.type != &(types[type]) ) + ( entry_ptr->header.type != &(types[type]) ) || - ( entry_ptr->size != entry_ptr->header.size ) + ( entry_ptr->size != entry_ptr->header.size ) || ( entry_ptr->addr != entry_ptr->header.addr ) ) { pass = FALSE; - failure_mssg = + failure_mssg = "error in H5C_mark_pinned_or_protected_entry_dirty()."; } @@ -1951,8 +1951,8 @@ protect_entry(H5C_t * cache_ptr, failure_mssg = "error in H5C_protect()."; } else { - - HDassert( ( entry_ptr->cache_ptr == NULL ) || + + HDassert( ( entry_ptr->cache_ptr == NULL ) || ( entry_ptr->cache_ptr == cache_ptr ) ); entry_ptr->cache_ptr = cache_ptr; diff --git a/test/cache_common.h b/test/cache_common.h index 9186840..452824e 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -105,7 +105,7 @@ #define MONSTER_ALT_BASE_ADDR (haddr_t)(HUGE_ALT_BASE_ADDR + \ (HUGE_ENTRY_SIZE * NUM_HUGE_ENTRIES)) -#define MAX_PINS 8 /* Maximum number of entries that can be +#define MAX_PINS 8 /* Maximum number of entries that can be * directly pinned by a single entry. */ typedef struct test_entry_t @@ -116,7 +116,7 @@ typedef struct test_entry_t struct test_entry_t * self; /* pointer to this entry -- used for * sanity checking. */ - H5C_t * cache_ptr; /* pointer to the cache in which + H5C_t * cache_ptr; /* pointer to the cache in which * the entry resides, or NULL if the * entry is not in cache. */ @@ -156,7 +156,7 @@ typedef struct test_entry_t hbool_t is_pinned; /* entry is currently pinned in * the cache. */ - int pinning_ref_count; /* Number of entries that + int pinning_ref_count; /* Number of entries that * pin this entry in the cache. * When this count drops to zero, * this entry should be unpinned. @@ -169,7 +169,7 @@ typedef struct test_entry_t int pin_type[MAX_PINS]; /* array of the types of entries * pinned by this entry. */ - int pin_idx[MAX_PINS]; /* array of the indicies of + int pin_idx[MAX_PINS]; /* array of the indicies of * entries pinned by this entry. */ hbool_t loaded; /* entry has been loaded since the diff --git a/test/cross_read.c b/test/cross_read.c index 4f7391f..d24ffa9 100755 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -16,7 +16,7 @@ * Programmer: Raymond Lu <slu@ncsa.uiuc.edu> * Thursday, March 23, 2006 * - * Purpose: Check if floating-point data created on OpenVMS (VAX type), Solaris, + * Purpose: Check if floating-point data created on OpenVMS (VAX type), Solaris, * and Linux machines can be read on the machine running this test. */ @@ -116,7 +116,7 @@ static int read_data(char *fname) H5Tclose(datatype); H5Dclose(dataset); H5Fclose(file); - + /* Failure */ if (nerrors) { printf("total of %d errors out of %d elements\n", nerrors, NX*NY); diff --git a/test/dt_arith.c b/test/dt_arith.c index dc12696..21a35b1 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -58,7 +58,7 @@ const char *FILENAME[] = { /* * Count up or down depending on whether the machine is big endian, little - * endian, or VAX (OpenVMS). If local variable `endian' is H5T_ORDER_BE then + * endian, or VAX (OpenVMS). If local variable `endian' is H5T_ORDER_BE then * the result will be I, otherwise the result will be Z-(I+1). VAX is printed * as little endian. */ @@ -90,7 +90,7 @@ static int skip_overflow_tests_g = 0; /* OpenVMS doesn't have this feature. Make sure to disable it*/ #ifdef H5_VMS #undef HANDLE_SIGFPE -#endif +#endif /* * Decide what values of floating-point number we want to test. They are @@ -635,7 +635,7 @@ test_hard_query(void) printf("Can't query conversion function\n"); goto error; } - + /* Register the hard conversion from int to float. Verify the conversion * is a hard conversion. */ H5Tregister(H5T_PERS_HARD, "int_flt", H5T_NATIVE_INT, H5T_NATIVE_FLOAT, H5T_conv_int_float); @@ -659,7 +659,7 @@ test_hard_query(void) /*------------------------------------------------------------------------- * Function: expt_handle * - * Purpose: Gets called from test_particular_fp_integer() for data type + * Purpose: Gets called from test_particular_fp_integer() for data type * conversion exceptions. * * Return: H5T_CONV_HANDLED 1 @@ -679,7 +679,7 @@ expt_handle(H5T_conv_except_t except_type, hid_t UNUSED src_id, hid_t UNUSED dst signed char fill_value1 = 7; int fill_value2 = 13; - if(except_type == H5T_CONV_EXCEPT_RANGE_HI || except_type == H5T_CONV_EXCEPT_RANGE_LOW || + if(except_type == H5T_CONV_EXCEPT_RANGE_HI || except_type == H5T_CONV_EXCEPT_RANGE_LOW || except_type == H5T_CONV_EXCEPT_TRUNCATE) { if(*(hbool_t*)user_data) *(signed char*)dst_buf = fill_value1; @@ -696,10 +696,10 @@ expt_handle(H5T_conv_except_t except_type, hid_t UNUSED src_id, hid_t UNUSED dst * * Purpose: Tests hard conversions from floating numbers to integers in * a special situation when the source is "float" and assigned - * the value of "INT_MAX". A compiler may do roundup making + * the value of "INT_MAX". A compiler may do roundup making * this value "INT_MAX+1". When this float value is casted to - * int, overflow happens. This test makes sure the library - * returns exception in this situation. + * int, overflow happens. This test makes sure the library + * returns exception in this situation. * * Also verifies the library handles conversion from double to * signed char correctly when the value of double is SCHAR_MAX. @@ -736,7 +736,7 @@ static int test_particular_fp_integer(void) size_t j; TESTING("hard particular floating number -> integer conversions"); - + if((dxpl_id = H5Pcreate(H5P_DATASET_XFER))<0) { H5_FAILED(); printf("Can't create data transfer property list\n"); @@ -782,7 +782,7 @@ static int test_particular_fp_integer(void) printf(" src = "); for (j=0; j<src_size1; j++) printf(" %02x", saved_buf1[ENDIAN(src_size1, j, endian)]); - + HDmemcpy(&x, saved_buf1, src_size1); printf(" %29.20e\n", x); @@ -812,7 +812,7 @@ static int test_particular_fp_integer(void) goto error; } - memcpy(&dst_i, buf2, dst_size2); + memcpy(&dst_i, buf2, dst_size2); /* Print errors */ if(dst_i != fill_value) { @@ -826,7 +826,7 @@ static int test_particular_fp_integer(void) printf(" src = "); for (j=0; j<src_size2; j++) printf(" %02x", saved_buf2[ENDIAN(src_size2, j, endian)]); - + HDmemcpy(&x, saved_buf2, src_size2); printf(" %29.20e\n", x); @@ -855,7 +855,7 @@ static int test_particular_fp_integer(void) free(saved_buf1); if(saved_buf2) free(saved_buf2); - + PASSED(); return 0; @@ -2681,7 +2681,7 @@ my_isnan(dtype_t type, void *val) } #ifdef H5_VMS - /* For "float" and "double" on OpenVMS/Alpha, NaN is + /* For "float" and "double" on OpenVMS/Alpha, NaN is * actually a valid value of maximal value.*/ if(!retval) { if (FLT_FLOAT==type) { @@ -2726,15 +2726,15 @@ my_isinf(dtype_t type, int endian, unsigned char *val, size_t size, ssize_t ret1=0, ret2=0; bits = (unsigned char*)calloc(1, size); - + #ifdef H5_VMS if(H5T_ORDER_VAX==endian) { for (i = 0; i < size; i += 4) { bits[i] = val[(size-2)-i]; bits[i+1] = val[(size-1)-i]; - + bits[(size-2)-i] = val[i]; - bits[(size-1)-i] = val[i+1]; + bits[(size-1)-i] = val[i+1]; } } else { for (i=0; i<size; i++) @@ -2953,9 +2953,9 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst) INIT_FP_NORM(float, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP, src_size, dst_size, buf, saved, nelmts); } else if(src_type == FLT_DOUBLE && dst_type == FLT_FLOAT) { - /*Temporary solution for VMS. Cap double values between maximal and minimal + /*Temporary solution for VMS. Cap double values between maximal and minimal *destination values because VMS return exception when overflows or underflows. - *Same below.*/ + *Same below.*/ INIT_FP_NORM(double, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP, src_size, dst_size, buf, saved, nelmts); } else if(src_type == FLT_DOUBLE) { @@ -2989,7 +2989,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst) } else goto error; #endif /*H5_VMS*/ - + break; case TEST_DENORM: if(src_type == FLT_FLOAT) { @@ -3129,7 +3129,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst) continue; /*no error*/ #ifdef H5_VMS - /* For "float" and "double" on OpenVMS/Alpha, NaN is + /* For "float" and "double" on OpenVMS/Alpha, NaN is * a valid value of maximal value.*/ if (FLT_FLOAT==src_type && my_isnan(src_type, saved+j*sizeof(float))) { @@ -3266,7 +3266,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst) for (k = 0; k < src_size; k += 4) { tmp[k] = saved[j*src_size+(src_size-2)-k]; tmp[k+1] = saved[j*src_size+(src_size-1)-k]; - + tmp[(src_size-2)-k] = saved[j*src_size+k]; tmp[(src_size-1)-k] = saved[j*src_size+k+1]; } @@ -3286,7 +3286,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst) for (k = 0; k < src_size; k += 4) { tmp[k] = buf[j*dst_size+(dst_size-2)-k]; tmp[k+1] = buf[j*dst_size+(dst_size-1)-k]; - + tmp[(dst_size-2)-k] = buf[j*dst_size+k]; tmp[(dst_size-1)-k] = buf[j*dst_size+k+1]; } @@ -4957,7 +4957,7 @@ run_int_fp_conv(const char *name) SKIPPED(); HDputs(" Test skipped due to compiler error in handling conversion."); } -#endif /* H5_LLONG_TO_LDOUBLE_CORRECT */ +#endif /* H5_LLONG_TO_LDOUBLE_CORRECT */ #if H5_ULLONG_TO_FP_CAST_WORKS && H5_ULLONG_TO_LDOUBLE_PRECISION && H5_LLONG_TO_LDOUBLE_CORRECT nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_ULLONG, H5T_NATIVE_LDOUBLE); #else /* H5_ULLONG_TO_FP_CAST_WORKS && H5_ULLONG_TO_LDOUBLE_PRECISION && H5_LLONG_TO_LDOUBLE_CORRECT */ diff --git a/test/dtypes.c b/test/dtypes.c index 20743bd..1e082c6 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -522,7 +522,7 @@ test_compound_1(void) printf("Operation not allowed for this type.\n"); goto error; } /* end if */ - + size = 128; H5E_BEGIN_TRY { ret = H5Tset_precision(complex_id, size); @@ -532,7 +532,7 @@ test_compound_1(void) printf("Operation not allowed for this type.\n"); goto error; } /* end if */ - + H5E_BEGIN_TRY { ret = H5Tget_pad(complex_id, &lsb, &msb); } H5E_END_TRY; @@ -550,7 +550,7 @@ test_compound_1(void) printf("Operation not allowed for this type.\n"); goto error; } /* end if */ - + H5E_BEGIN_TRY { lsb = H5Tget_inpad(complex_id); } H5E_END_TRY; @@ -3159,7 +3159,7 @@ test_conv_str_3(void) if (H5Tget_strpad(type)<0) goto error; if (H5Tset_offset(type, 0)<0) goto error; if (H5Tget_order(type)<0) goto error; - + H5E_BEGIN_TRY { ret=H5Tset_precision(type, nelmts); } H5E_END_TRY; @@ -3168,7 +3168,7 @@ test_conv_str_3(void) printf("Operation not allowed for this type.\n"); goto error; } /* end if */ - + H5E_BEGIN_TRY { size=H5Tget_ebias(type); } H5E_END_TRY; @@ -3511,10 +3511,10 @@ test_bitfield_funcs(void) * First create a bitfield type. */ if((type = H5Tcopy(H5T_STD_B32LE))<0) goto error; - + /* * Offset a 12-byte value in the middle of a 16 and 32 byte - * field. Pad unused bits with ones. + * field. Pad unused bits with ones. * ____ ____ __10 1010 1010 10__ ____ ____ */ if(H5Tset_precision(type, 12)<0) goto error; @@ -3531,7 +3531,7 @@ test_bitfield_funcs(void) printf("Operation not allowed for this type.\n"); goto error; } /* end if */ - + H5E_BEGIN_TRY { inpad=H5Tget_inpad(type); } H5E_END_TRY; @@ -3811,7 +3811,7 @@ opaque_long(void) /*------------------------------------------------------------------------- * Function: opaque_funcs * - * Purpose: Test some type functions that are and aren't supposed to + * Purpose: Test some type functions that are and aren't supposed to * work with opaque type. * * Return: Success: 0 @@ -3839,7 +3839,7 @@ opaque_funcs(void) /* Build opaque type */ if ((type=H5Tcreate(H5T_OPAQUE, 4))<0) TEST_ERROR if (H5Tset_tag(type, "opaque source type")<0) TEST_ERROR - + if ((size=H5Tget_size(type))==0) goto error; H5E_BEGIN_TRY { @@ -4351,7 +4351,7 @@ conv_except(H5T_conv_except_t except_type, hid_t UNUSED src_id, hid_t UNUSED dst user_data->num_precision++; else if(except_type == H5T_CONV_EXCEPT_TRUNCATE) user_data->num_truncate++; - else + else user_data->num_other++; return(H5T_CONV_UNHANDLED); diff --git a/test/enum.c b/test/enum.c index 4e97a25..f626f5c 100644 --- a/test/enum.c +++ b/test/enum.c @@ -428,7 +428,7 @@ test_value_dsnt_exist(void) /*------------------------------------------------------------------------- * Function: test_funcs * - * Purpose: Create an enumeration data type and test some functions + * Purpose: Create an enumeration data type and test some functions * that are or aren't supposed to work with it. * * Return: Success: 0 @@ -468,7 +468,7 @@ test_funcs(void) if ((size=H5Tget_offset(type))<0) goto error; if (H5Tget_sign(type)<0) goto error; if (H5Tget_super(type)<0) goto error; - + H5E_BEGIN_TRY { ret=H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); } H5E_END_TRY; diff --git a/test/fheap.c b/test/fheap.c index 9efa38e..67d021a 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -218,11 +218,11 @@ error: * man_size * man_alloc_size * man_free_space - * + * * The following fields in the 'state' structure are set to * the current state, before any block has been created: * nobjs - * + * * Return: Success: 0 * * Failure: 1 @@ -531,11 +531,11 @@ error: * man_size * man_alloc_size * man_free_space - * + * * The following fields in the 'state' structure are set to * the current state, before the block has been created: * nobjs - * + * * Return: Success: 0 * * Failure: 1 @@ -754,7 +754,7 @@ fill_root_row(H5HF_t *fh, hid_t dxpl, unsigned row, size_t obj_size, expand_rows = 1; else if(POWER_OF_TWO(row)) expand_rows = row; - else + else expand_rows = 0; /* Compute first block & all blocks heap size & free space */ @@ -1061,7 +1061,7 @@ error: * Function: fill_3rd_indirect * * Purpose: Insert (small) objects to fill up the free space in all direct - * heap blocks in a third-level indirect block (which + * heap blocks in a third-level indirect block (which * has one more level of indirect blocks) * * Return: Success: 0 @@ -1100,7 +1100,7 @@ error: * Function: fill_3rd_indirect_row * * Purpose: Insert (small) objects to fill up the free space in all direct - * heap blocks in a row of third-level indirect block (which + * heap blocks in a row of third-level indirect block (which * have one more level of indirect blocks) * * Return: Success: 0 @@ -1140,7 +1140,7 @@ error: * Function: fill_all_3rd_indirect_rows * * Purpose: Insert (small) objects to fill up the free space in all direct - * heap blocks in all rows of third-level indirect blocks (which + * heap blocks in all rows of third-level indirect blocks (which * have one more level of indirect blocks) * * Return: Success: 0 @@ -1180,7 +1180,7 @@ error: * Function: fill_4th_indirect_row * * Purpose: Insert (small) objects to fill up the free space in all direct - * heap blocks in a row of fourth-level indirect blocks (which + * heap blocks in a row of fourth-level indirect blocks (which * have two more levels of indirect blocks) * * Return: Success: 0 @@ -1230,7 +1230,7 @@ error: * Function: fill_all_4th_indirect_rows * * Purpose: Insert (small) objects to fill up the free space in all direct - * heap blocks in all rows of fourth-level indirect blocks (which + * heap blocks in all rows of fourth-level indirect blocks (which * have two more levels of indirect blocks) * * Return: Success: 0 @@ -3088,7 +3088,7 @@ test_abs_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test FAIL_STACK_ERROR } /* end if */ - /* Insert one more object, to force creation of second + /* Insert one more object, to force creation of second * recursive indirect block */ state.man_alloc_size += DBLOCK_SIZE(fh, 0); @@ -3406,7 +3406,7 @@ test_abs_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR } /* end if */ - /* Insert one more object, to force creation of second + /* Insert one more object, to force creation of second * recursive indirect block */ state.man_alloc_size += DBLOCK_SIZE(fh, 0); @@ -4433,7 +4433,7 @@ error: * block, fill all direct blocks in the row of indirect * blocks that are 2 levels deep, fill all indirect blocks * that are three levels deep, fill all rows of indirect blocks - * that are four levels deep and start first direct block in + * that are four levels deep and start first direct block in * indirect blocks five levels deep * * Return: Success: 0 @@ -5886,7 +5886,7 @@ error: * Function: test_abs_fill_direct_skip_2nd_indirect_start_block_add_skipped * * Purpose: Test filling all direct blocks in root indirect block, then - * add object too large for all direct blocks in first row of + * add object too large for all direct blocks in first row of * indirect blocks, to force skipping a row of indirect blocks * (and range of skipped blocks), then backfill all direct blocks * skipped and extend to next "normal" direct block. @@ -6254,7 +6254,7 @@ error: * Function: test_abs_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped * * Purpose: Test filling all direct blocks in root indirect block, then - * add object too large for all direct blocks in first row of + * add object too large for all direct blocks in first row of * indirect blocks, to force skipping a row of indirect blocks * (and range of skipped blocks), then add object that is too * large for initial block size in skipped indirect blocks, then @@ -9644,7 +9644,7 @@ test_abs_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar obj_size = DBLOCK_FREE(fh, 2) - (DBLOCK_SIZE(fh, 0) / 2); if(add_obj(fh, dxpl, 20, obj_size, &state, NULL)) FAIL_STACK_ERROR - + PASSED() /* Close the fractal heap */ @@ -9814,7 +9814,7 @@ test_abs_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR } /* end for */ } /* end for */ - + /* Check for closing & re-opening the heap */ if(tparam->reopen_heap) { /* Close heap */ @@ -9840,7 +9840,7 @@ test_abs_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar if(add_obj(fh, dxpl, 10, obj_size, &state, NULL)) FAIL_STACK_ERROR } /* end for */ - + /* Check for closing & re-opening the heap */ if(tparam->reopen_heap) { /* Close heap */ @@ -9977,7 +9977,7 @@ HDfprintf(stderr, "num_first_indirect_rows = %u\n", num_first_indirect_rows); FAIL_STACK_ERROR } /* end for */ } /* end for */ - + /* Check for closing & re-opening the heap */ if(tparam->reopen_heap) { /* Close heap */ diff --git a/test/h5test.c b/test/h5test.c index 3784001..be843f3 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -293,7 +293,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) /* Must first check fapl is not H5P_DEFAULT (-1) because H5FD_XXX * could be of value -1 if it is not defined. */ - isppdriver = H5P_DEFAULT != fapl && + isppdriver = H5P_DEFAULT != fapl && (H5FD_MPIO==driver || H5FD_MPIPOSIX==driver); /* Check HDF5_NOCLEANUP environment setting. @@ -475,7 +475,7 @@ h5_rmprefix(const char *filename) ret_ptr = filename; else ret_ptr++; - + return(ret_ptr); } @@ -953,7 +953,7 @@ char* getenv_all(MPI_Comm comm, int root, const char* name) /* use original getenv */ if(env) HDfree(env); - env = HDgetenv(name); + env = HDgetenv(name); }else{ MPI_Comm_rank(comm, &mpi_rank); MPI_Comm_size(comm, &mpi_size); diff --git a/test/links.c b/test/links.c index 3c47463..0d3388c 100644 --- a/test/links.c +++ b/test/links.c @@ -516,7 +516,7 @@ toomany(hid_t fapl) hid_t gid2 = (-1); /* Datatype ID */ char objname[NAME_BUF_SIZE]; /* Object name */ ssize_t name_len; /* Length of object name */ - char filename[NAME_BUF_SIZE]; + char filename[NAME_BUF_SIZE]; TESTING("too many links"); diff --git a/test/objcopy.c b/test/objcopy.c index 51f06e6..daf382e 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -70,12 +70,12 @@ const char *FILENAME[] = { #define NUM_ATTRIBUTES 4 #define ATTR_NAME_LEN 40 #define DIM_SIZE_1 12 -#define DIM_SIZE_2 6 +#define DIM_SIZE_2 6 #define CHUNK_SIZE_1 5 /* Not an even fraction of dimension sizes, so we test copying partial chunks */ #define CHUNK_SIZE_2 5 -#define NUM_SUB_GROUPS 20 -#define NUM_WIDE_LOOP_GROUPS 10 -#define NUM_DATASETS 10 +#define NUM_SUB_GROUPS 20 +#define NUM_WIDE_LOOP_GROUPS 10 +#define NUM_DATASETS 10 char src_obj_full_name[215]; /* the full path + name of the object to be copied */ @@ -185,8 +185,8 @@ addr_reset(void) * * Return: Non-negative on success/Negative on failure * - * Programmer: Peter Cao - * Saturday, December 17, 2005 + * Programmer: Peter Cao + * Saturday, December 17, 2005 * * Modifications: * @@ -213,7 +213,7 @@ test_copy_attach_attribute_vl(hid_t loc_id) for(j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = j+1; } /* end for */ - + if ( (aid = H5Acreate(loc_id, "vlen attribute", tid, sid, H5P_DEFAULT)) < 0) goto done; @@ -242,8 +242,8 @@ done: * * Return: Non-negative on success/Negative on failure * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -274,8 +274,8 @@ test_copy_attach_attributes(hid_t loc_id, hid_t type_id) if ( H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) goto done; - if (aid > 0) - H5Aclose(aid); + if (aid > 0) + H5Aclose(aid); aid = -1; } @@ -283,9 +283,9 @@ test_copy_attach_attributes(hid_t loc_id, hid_t type_id) ret_value = 0; done: - if (sid > 0) + if (sid > 0) H5Sclose(sid); - if (aid > 0) + if (aid > 0) H5Aclose(aid); return ret_value; @@ -300,7 +300,7 @@ done: * Return: Non-negative on success/Negative on failure * * Programmer: Quincey Koziol - * Tuesday, November 1, 2005 + * Tuesday, November 1, 2005 * *------------------------------------------------------------------------- */ @@ -337,9 +337,9 @@ test_copy_attach_paired_attributes(hid_t loc_id, hid_t loc_id2, hid_t type_id) return 0; done: - if (sid > 0) + if (sid > 0) H5Sclose(sid); - if (aid > 0) + if (aid > 0) H5Aclose(aid); return -1; @@ -354,7 +354,7 @@ done: * Return: TRUE if attributes are equal/FALSE if they are different * * Programmer: Peter Cao - * Saturday, December 17, 2005 + * Saturday, December 17, 2005 * *------------------------------------------------------------------------- */ @@ -471,7 +471,7 @@ error: * Return: TRUE if objects have same attributes/FALSE if they are different * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * * Note: This isn't very general, the attributes are assumed to be * those written in test_copy_attach_attributes(). @@ -543,7 +543,7 @@ error: * Return: TRUE if buffer are equal/FALSE if they are different * * Programmer: Quincey Koziol - * Monday, November 21, 2005 + * Monday, November 21, 2005 * *------------------------------------------------------------------------- */ @@ -602,7 +602,7 @@ error: * Return: TRUE if datasets are equal/FALSE if they are different * * Programmer: Quincey Koziol - * Tuesday, October 25, 2005 + * Tuesday, October 25, 2005 * *------------------------------------------------------------------------- */ @@ -780,7 +780,7 @@ error: * Return: TRUE if group are equal/FALSE if they are different * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -928,8 +928,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -973,17 +973,17 @@ test_copy_named_datatype(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the datatype from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATATYPE_SIMPLE, fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the datatype for copy */ + /* open the datatype for copy */ if ( (tid = H5Topen(fid_src, NAME_DATATYPE_SIMPLE)) < 0) TEST_ERROR; - /* open the copied datatype */ + /* open the copied datatype */ if ( (tid2 = H5Topen(fid_dst, NAME_DATATYPE_SIMPLE)) < 0) TEST_ERROR; /* Compare the datatypes */ @@ -1024,7 +1024,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 22, 2005 + * Tuesday, November 22, 2005 * *------------------------------------------------------------------------- */ @@ -1066,17 +1066,17 @@ test_copy_named_datatype_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the datatype from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATATYPE_VL, fid_dst, NAME_DATATYPE_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the datatype for copy */ + /* open the datatype for copy */ if ( (tid = H5Topen(fid_src, NAME_DATATYPE_VL)) < 0) TEST_ERROR; - /* open the copied datatype */ + /* open the copied datatype */ if ( (tid2 = H5Topen(fid_dst, NAME_DATATYPE_VL)) < 0) TEST_ERROR; /* Compare the datatypes */ @@ -1117,7 +1117,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 22, 2005 + * Tuesday, November 22, 2005 * *------------------------------------------------------------------------- */ @@ -1165,17 +1165,17 @@ test_copy_named_datatype_vl_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the datatype from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATATYPE_VL_VL, fid_dst, NAME_DATATYPE_VL_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the datatype for copy */ + /* open the datatype for copy */ if ( (tid = H5Topen(fid_src, NAME_DATATYPE_VL_VL)) < 0) TEST_ERROR; - /* open the copied datatype */ + /* open the copied datatype */ if ( (tid2 = H5Topen(fid_dst, NAME_DATATYPE_VL_VL)) < 0) TEST_ERROR; /* Compare the datatypes */ @@ -1215,8 +1215,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -1257,7 +1257,7 @@ test_copy_dataset_simple(hid_t fapl) /* create 2D dataspace */ if ( (sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR; - + /* create 2D int dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -1282,17 +1282,17 @@ test_copy_dataset_simple(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -1335,7 +1335,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -1367,7 +1367,7 @@ test_copy_dataset_simple_empty(hid_t fapl) /* create 2D dataspace */ if ( (sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR; - + /* create 2D int dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -1389,17 +1389,17 @@ test_copy_dataset_simple_empty(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -1440,8 +1440,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -1519,17 +1519,17 @@ test_copy_dataset_compound(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_COMPOUND, fid_dst, NAME_DATASET_COMPOUND, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_COMPOUND)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_COMPOUND)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -1571,8 +1571,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -1647,17 +1647,17 @@ test_copy_dataset_chunked(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -1701,7 +1701,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -1764,17 +1764,17 @@ test_copy_dataset_chunked_empty(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -1818,7 +1818,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -1902,17 +1902,17 @@ test_copy_dataset_chunked_sparse(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -1955,7 +1955,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2035,17 +2035,17 @@ test_copy_dataset_compressed(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -2091,7 +2091,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2163,17 +2163,17 @@ test_copy_dataset_compact(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_COMPACT, fid_dst, NAME_DATASET_COMPACT, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_COMPACT)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_COMPACT)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -2215,8 +2215,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -2260,7 +2260,7 @@ test_copy_dataset_external(hid_t fapl) /* create dataspace */ if ( (sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR; - + /* set dataset creation plist */ size = DIM_SIZE_1 * sizeof (int); if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; @@ -2290,7 +2290,7 @@ test_copy_dataset_external(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Don't change the address in the destination file for this test, it causes the * external file list's heap to be at a different location and generates a false * negative for this test. The test is _slightly_ weaker because of this, but @@ -2304,10 +2304,10 @@ test_copy_dataset_external(hid_t fapl) /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_EXTERNAL, fid_dst, NAME_DATASET_EXTERNAL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_EXTERNAL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_EXTERNAL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -2351,7 +2351,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Monday, October 31, 2005 + * Monday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2393,7 +2393,7 @@ test_copy_dataset_named_dtype(hid_t fapl) /* create named datatype */ if ( (tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR; if ( (H5Tcommit(fid_src, NAME_DATATYPE_SIMPLE, tid)) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -2418,17 +2418,17 @@ test_copy_dataset_named_dtype(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_dst, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_NAMED_DTYPE)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_NAMED_DTYPE)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -2472,7 +2472,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, October 31, 2005 + * Tuesday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2518,7 +2518,7 @@ test_copy_dataset_named_dtype_hier(hid_t fapl) /* create named datatype _inside_ hierarchy to copy */ if ( (tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR; if ( (H5Tcommit(gid, NAME_DATATYPE_SIMPLE, tid)) < 0) TEST_ERROR; - + /* create first dataset at SRC file */ if ( (did = H5Dcreate(gid, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -2555,17 +2555,17 @@ test_copy_dataset_named_dtype_hier(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -2611,7 +2611,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, October 31, 2005 + * Tuesday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2657,7 +2657,7 @@ test_copy_dataset_named_dtype_hier_outside(hid_t fapl) /* create named datatype _outside_ hierarchy to copy */ if ( (tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR; if ( (H5Tcommit(fid_src, NAME_DATATYPE_SIMPLE, tid)) < 0) TEST_ERROR; - + /* create first dataset at SRC file */ if ( (did = H5Dcreate(gid, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -2694,17 +2694,17 @@ test_copy_dataset_named_dtype_hier_outside(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -2743,14 +2743,14 @@ error: * Function: test_copy_dataset_multi_ohdr_chunks * * Purpose: Create a pair of datasets that add attributes in a way that - * creates lots of object header chunks in SRC file and copy + * creates lots of object header chunks in SRC file and copy * datasets to DST file * * Return: Success: 0 * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, October 31, 2005 + * Tuesday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2828,17 +2828,17 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -2883,7 +2883,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, October 31, 2005 + * Tuesday, October 31, 2005 * *------------------------------------------------------------------------- */ @@ -2929,7 +2929,7 @@ test_copy_dataset_attr_named_dtype(hid_t fapl) /* create named datatype _outside_ hierarchy to copy */ if ( (tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR; if ( (H5Tcommit(fid_src, NAME_DATATYPE_SIMPLE, tid)) < 0) TEST_ERROR; - + /* create first dataset at SRC file */ if ( (did = H5Dcreate(gid, NAME_DATASET_MULTI_OHDR, tid, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -2969,17 +2969,17 @@ test_copy_dataset_attr_named_dtype(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -3024,8 +3024,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * *------------------------------------------------------------------------- */ @@ -3070,7 +3070,7 @@ test_copy_dataset_contig_vl(hid_t fapl) /* create datatype */ if ( (tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -3089,17 +3089,17 @@ test_copy_dataset_contig_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -3153,8 +3153,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Saturday, December 10, 2005 + * Programmer: Peter Cao + * Saturday, December 10, 2005 * *------------------------------------------------------------------------- */ @@ -3201,7 +3201,7 @@ test_copy_dataset_chunked_vl(hid_t fapl) /* create datatype */ if ( (tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR; - + /* create and set chunk plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR; @@ -3227,17 +3227,17 @@ test_copy_dataset_chunked_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -3291,8 +3291,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Sunday, December 11, 2005 + * Programmer: Peter Cao + * Sunday, December 11, 2005 * *------------------------------------------------------------------------- */ @@ -3342,7 +3342,7 @@ test_copy_dataset_compact_vl(hid_t fapl) /* create and set compact plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL, tid, sid, pid)) < 0) TEST_ERROR; @@ -3364,17 +3364,17 @@ test_copy_dataset_compact_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -3422,14 +3422,14 @@ error: /*------------------------------------------------------------------------- * Function: test_copy_attribute_vl * - * Purpose: Create a simple dataset with vlen attributes in SRC file + * Purpose: Create a simple dataset with vlen attributes in SRC file * and copy it to DST file (Note: dataset has no data) * * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Saturday, December , 2005 + * Programmer: Peter Cao + * Saturday, December , 2005 * *------------------------------------------------------------------------- */ @@ -3462,7 +3462,7 @@ test_copy_attribute_vl(hid_t fapl) /* create 2D dataspace */ if ( (sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR; - + /* create 2D int dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -3491,10 +3491,10 @@ test_copy_attribute_vl(hid_t fapl) /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; /* Check if the attributes are equal */ @@ -3537,14 +3537,14 @@ error: /*------------------------------------------------------------------------- * Function: test_copy_dataset_compressed_vl * - * Purpose: Create a compressed, chunked, VLEN dataset in SRC + * Purpose: Create a compressed, chunked, VLEN dataset in SRC * file and copy it to DST file * * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Tuesday, December 27, 2005 + * Programmer: Peter Cao + * Tuesday, December 27, 2005 * *------------------------------------------------------------------------- */ @@ -3576,7 +3576,7 @@ test_copy_dataset_compressed_vl(hid_t fapl) for (j = 0; j < DIM_SIZE_2; j++) { buf[i][j].len = j + 1; buf[i][j].p = (int *)HDmalloc(buf[i][j].len * sizeof(int)); - for (k = 0; k < (int)buf[i][j].len; k++) + for (k = 0; k < (int)buf[i][j].len; k++) ((int *)buf[i][j].p)[k] = i * 10000 + j * 100 + k; } } @@ -3634,10 +3634,10 @@ test_copy_dataset_compressed_vl(hid_t fapl) /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_CHUNKED)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -3693,8 +3693,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -3738,17 +3738,17 @@ test_copy_group_empty(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the group from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_EMPTY, fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_EMPTY)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_EMPTY)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -3788,8 +3788,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -3842,7 +3842,7 @@ test_copy_group(hid_t fapl) /* add a dataset to the group */ if ( (did = H5Dcreate(fid_src, NAME_GROUP_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT) ) < 0) TEST_ERROR; if ( H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR; - + /* close dataspace */ if ( H5Sclose(sid) < 0) TEST_ERROR; @@ -3869,17 +3869,17 @@ test_copy_group(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the group from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -3923,7 +3923,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 1, 2005 + * Tuesday, November 1, 2005 * *------------------------------------------------------------------------- */ @@ -4011,17 +4011,17 @@ test_copy_group_deep(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the group from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -4065,7 +4065,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 1, 2005 + * Tuesday, November 1, 2005 * *------------------------------------------------------------------------- */ @@ -4122,17 +4122,17 @@ test_copy_group_loop(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the group from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -4175,7 +4175,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 1, 2005 + * Tuesday, November 1, 2005 * * Note: Create groups w/lots of entries in each level, so that "dense" * group form is used. @@ -4251,17 +4251,17 @@ test_copy_group_wide_loop(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the group from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -4303,8 +4303,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * @@ -4356,7 +4356,7 @@ test_copy_group_links(hid_t fapl) /* add a dataset to the group */ if ( (did = H5Dcreate(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT) ) < 0) TEST_ERROR; if ( H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR; - + /* close dataspace */ if ( H5Sclose(sid) < 0) TEST_ERROR; @@ -4384,17 +4384,17 @@ test_copy_group_links(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the group from SRC to DST */ if ( H5Gcopy(fid_src, NAME_GROUP_LINK, fid_dst, NAME_GROUP_LINK, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_LINK)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_LINK)) < 0) TEST_ERROR; /* Check if the groups are equal */ @@ -4438,7 +4438,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, September 30, 2005 + * Tuesday, September 30, 2005 * *------------------------------------------------------------------------- */ @@ -4488,7 +4488,7 @@ test_copy_soft_link(hid_t fapl) /* add a dataset to the group */ if ( (did = H5Dcreate(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT) ) < 0) TEST_ERROR; if ( H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR; - + /* close dataspace */ if ( H5Sclose(sid) < 0) TEST_ERROR; @@ -4510,17 +4510,17 @@ test_copy_soft_link(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_LINK_SOFT, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset through the soft link for copy */ + /* open the dataset through the soft link for copy */ if ( (did = H5Dopen(fid_src, NAME_LINK_SOFT)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -4564,7 +4564,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 8, 2005 + * Tuesday, November 8, 2005 * *------------------------------------------------------------------------- */ @@ -4604,7 +4604,7 @@ test_copy_exist(hid_t fapl) /* create 2D dataspace */ if ( (sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR; - + /* create 2D int dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -4629,7 +4629,7 @@ test_copy_exist(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; @@ -4666,13 +4666,13 @@ error: * Function: test_copy_path * * Purpose: Create a simple dataset in SRC file and copy it to DST file - * using a full path name + * using a full path name * * Return: Success: 0 * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 8, 2005 + * Tuesday, November 8, 2005 * *------------------------------------------------------------------------- */ @@ -4713,7 +4713,7 @@ test_copy_path(hid_t fapl) /* create 2D dataspace */ if ( (sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR; - + /* create 2D int dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -4738,7 +4738,7 @@ test_copy_path(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; @@ -4761,10 +4761,10 @@ test_copy_path(hid_t fapl) /* copy the dataset from SRC to DST, using full path */ if ( H5Gcopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_SIMPLE)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_SUB_SUB)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -4807,7 +4807,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Tuesday, November 8, 2005 + * Tuesday, November 8, 2005 * *------------------------------------------------------------------------- */ @@ -4839,7 +4839,7 @@ test_copy_same_file_named_datatype(hid_t fapl) /* copy the datatype from SRC to DST */ if ( H5Gcopy(fid, NAME_DATATYPE_SIMPLE, fid, NAME_DATATYPE_SIMPLE2, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the copied datatype */ + /* open the copied datatype */ if ( (tid2 = H5Topen(fid, NAME_DATATYPE_SIMPLE2)) < 0) TEST_ERROR; /* Compare the datatypes */ @@ -4876,7 +4876,7 @@ error: * Failure: number of errors * * Programmer: Quincey Koziol - * Saturday, November 5, 2005 + * Saturday, November 5, 2005 * *------------------------------------------------------------------------- */ @@ -4957,7 +4957,7 @@ test_copy_dataset_compact_named_vl(hid_t fapl) /* create and set compact plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL, tid, sid, pid)) < 0) TEST_ERROR; @@ -4982,17 +4982,17 @@ test_copy_dataset_compact_named_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -5122,17 +5122,17 @@ test_copy_dataset_contig_named_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -5245,7 +5245,7 @@ test_copy_dataset_chunked_named_vl(hid_t fapl) /* create and set chunk plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL, tid, sid, pid)) < 0) TEST_ERROR; @@ -5270,17 +5270,17 @@ test_copy_dataset_chunked_named_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -5395,7 +5395,7 @@ test_copy_dataset_compressed_named_vl(hid_t fapl) if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR; if ( H5Pset_deflate(pid, 9) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL, tid, sid, pid)) < 0) TEST_ERROR; @@ -5420,17 +5420,17 @@ test_copy_dataset_compressed_named_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -5480,14 +5480,14 @@ error: /*------------------------------------------------------------------------- * Function: test_copy_dataset_compact_vl_vl * - * Purpose: Create a compact dataset w/nested VLEN datatype + * Purpose: Create a compact dataset w/nested VLEN datatype * in SRC file and copy it to DST file * * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Saturday, February 11, 2006 + * Programmer: Peter Cao + * Saturday, February 11, 2006 * *------------------------------------------------------------------------- */ @@ -5554,7 +5554,7 @@ test_copy_dataset_compact_vl_vl(hid_t fapl) /* create and set compact plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL_VL, tid2, sid, pid)) < 0) TEST_ERROR; @@ -5576,17 +5576,17 @@ test_copy_dataset_compact_vl_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -5635,14 +5635,14 @@ error: /*------------------------------------------------------------------------- * Function: test_copy_dataset_contig_vl_vl * - * Purpose: Create a compact dataset w/nested VLEN datatype + * Purpose: Create a compact dataset w/nested VLEN datatype * in SRC file and copy it to DST file * * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * Saturday, February 11, 2006 + * Programmer: Peter Cao + * Saturday, February 11, 2006 * *------------------------------------------------------------------------- */ @@ -5708,7 +5708,7 @@ test_copy_dataset_contig_vl_vl(hid_t fapl) /* create and set compact plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -5730,17 +5730,17 @@ test_copy_dataset_contig_vl_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -5863,7 +5863,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fapl) /* create and set chunk plist */ if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL_VL, tid2, sid, pid)) < 0) TEST_ERROR; @@ -5885,16 +5885,16 @@ test_copy_dataset_chunked_vl_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -6020,7 +6020,7 @@ test_copy_dataset_compressed_vl_vl(hid_t fapl) if ( (pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; if ( H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR; if ( H5Pset_deflate(pid, 9) < 0) TEST_ERROR; - + /* create dataset at SRC file */ if ( (did = H5Dcreate(fid_src, NAME_DATASET_VL_VL, tid2, sid, pid)) < 0) TEST_ERROR; @@ -6042,16 +6042,16 @@ test_copy_dataset_compressed_vl_vl(hid_t fapl) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - + if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; /* copy the dataset from SRC to DST */ if ( H5Gcopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT) < 0) TEST_ERROR; - /* open the dataset for copy */ + /* open the dataset for copy */ if ( (did = H5Dopen(fid_src, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; - /* open the destination dataset */ + /* open the destination dataset */ if ( (did2 = H5Dopen(fid_dst, NAME_DATASET_VL_VL)) < 0) TEST_ERROR; /* Check if the datasets are equal */ @@ -6107,8 +6107,8 @@ error: * Return: Success: 0 * Failure: number of errors * - * Programmer: Peter Cao - * March 11, 2006 + * Programmer: Peter Cao + * March 11, 2006 * * Modifications: * @@ -6221,8 +6221,8 @@ test_copy_option(hid_t fapl, unsigned flag, const char* test_desciption) /* create destination file */ if ( (fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - - /* Create an uncopied object in destination file so that addresses in source and destination + + /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ if ( H5Gclose(H5Gcreate(fid_dst, NAME_GROUP_UNCOPIED, (size_t)0)) < 0) TEST_ERROR; @@ -6240,10 +6240,10 @@ test_copy_option(hid_t fapl, unsigned flag, const char* test_desciption) if ((flag & H5G_COPY_CREATE_INTERMEDIATE_GROUP_FLAG) > 0) { if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, "/new_g0/new_g00", pid) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, "/new_g0/new_g00")) < 0) TEST_ERROR; } else if ((flag & H5G_COPY_EXPAND_SOFT_LINK_FLAG) > 0) { @@ -6253,27 +6253,27 @@ test_copy_option(hid_t fapl, unsigned flag, const char* test_desciption) /* (So group comparison works properly) */ if ( H5Gunlink(fid_src, NAME_DATASET_SUB_SUB) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_LINK2)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_LINK)) < 0) TEST_ERROR; } else if(flag & H5G_COPY_WITHOUT_ATTR_FLAG) { if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, pid) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; } else if(flag & H5G_COPY_SHALLOW_HIERARCHY_FLAG) { if ( H5Gcopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, pid) < 0) TEST_ERROR; - /* open the group for copy */ + /* open the group for copy */ if ( (gid = H5Gopen(fid_src, NAME_GROUP_TOP)) < 0) TEST_ERROR; - /* open the destination group */ + /* open the destination group */ if ( (gid2 = H5Gopen(fid_dst, NAME_GROUP_TOP)) < 0) TEST_ERROR; /* Set the copy depth */ @@ -6320,20 +6320,20 @@ error: /*------------------------------------------------------------------------- - * Function: main + * Function: main * - * Purpose: Test H5Gcopy() + * Purpose: Test H5Gcopy() * * Return: Non-negative on success/Negative on failure * - * Programmer: Peter Cao - * Friday, September 30, 2005 + * Programmer: Peter Cao + * Friday, September 30, 2005 * * Modifications: * *------------------------------------------------------------------------- */ -int +int main(void) { int nerrors = 0; @@ -6378,18 +6378,18 @@ main(void) nerrors += test_copy_group(fapl); nerrors += test_copy_group_deep(fapl); nerrors += test_copy_group_loop(fapl); - nerrors += test_copy_group_wide_loop(fapl); - nerrors += test_copy_group_links(fapl); - nerrors += test_copy_soft_link(fapl); - nerrors += test_copy_exist(fapl); - nerrors += test_copy_path(fapl); - nerrors += test_copy_same_file_named_datatype(fapl); + nerrors += test_copy_group_wide_loop(fapl); + nerrors += test_copy_group_links(fapl); + nerrors += test_copy_soft_link(fapl); + nerrors += test_copy_exist(fapl); + nerrors += test_copy_path(fapl); + nerrors += test_copy_same_file_named_datatype(fapl); nerrors += test_copy_option(fapl, H5G_COPY_WITHOUT_ATTR_FLAG, "H5Gcopy(): without attributes"); nerrors += test_copy_option(fapl, H5G_COPY_CREATE_INTERMEDIATE_GROUP_FLAG, "H5Gcopy(): with missing groups"); nerrors += test_copy_option(fapl, H5G_COPY_EXPAND_SOFT_LINK_FLAG, "H5Gcopy(): expand soft link"); nerrors += test_copy_option(fapl, H5G_COPY_SHALLOW_HIERARCHY_FLAG, "H5Gcopy(): shallow group copy"); -/* TODO: not implemented +/* TODO: not implemented nerrors += test_copy_option(fapl, H5G_COPY_EXPAND_EXT_LINK_FLAG, "H5Gcopy: expand external link"); nerrors += test_copy_option(fapl, H5G_COPY_EXPAND_EXPAND_OBJ_REFERENCE_FLAG, "H5Gcopy: expand object reference"); */ @@ -6397,7 +6397,7 @@ main(void) /* TODO: Add more tests for copying objects in same file */ -/* TODO: Add more tests for copying objects in mounted files +/* TODO: Add more tests for copying objects in mounted files nerrors += test_copy_mount(fapl); */ diff --git a/test/stab.c b/test/stab.c index 09a5438..945dca6 100644 --- a/test/stab.c +++ b/test/stab.c @@ -290,7 +290,7 @@ lifecycle(hid_t fapl) unsigned nmsgs; /* Number of messages in group's header */ H5G_stat_t obj_stat; /* Object info */ char objname[NAME_BUF_SIZE]; /* Object name */ - char filename[NAME_BUF_SIZE]; + char filename[NAME_BUF_SIZE]; off_t empty_size; /* Size of an empty file */ unsigned u; /* Local index variable */ off_t file_size; /* Size of each file created */ @@ -505,7 +505,7 @@ long_compact(hid_t fapl) hid_t gid = (-1); /* Group ID */ hid_t gid2 = (-1); /* Group ID */ char *objname; /* Object name */ - char filename[NAME_BUF_SIZE]; + char filename[NAME_BUF_SIZE]; off_t empty_size; /* Size of an empty file */ off_t file_size; /* Size of each file created */ @@ -750,7 +750,7 @@ no_compact(hid_t fapl) hid_t gid2 = (-1); /* Datatype ID */ hid_t gcpl = (-1); /* Group creation property list ID */ char objname[NAME_BUF_SIZE]; /* Object name */ - char filename[NAME_BUF_SIZE]; + char filename[NAME_BUF_SIZE]; off_t empty_size; /* Size of an empty file */ off_t file_size; /* Size of each file created */ size_t lheap_size_hint; /* Local heap size */ @@ -875,7 +875,7 @@ gcpl_on_root(hid_t fapl) hid_t gcpl = (-1); /* Group creation property list ID */ unsigned max_compact; /* Maximum # of links to store in group compactly */ unsigned min_dense; /* Minimum # of links to store in group "densely" */ - char filename[NAME_BUF_SIZE]; + char filename[NAME_BUF_SIZE]; TESTING("setting root group creation properties"); diff --git a/test/testframe.c b/test/testframe.c index 639bded..e628d14 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -378,7 +378,7 @@ int SetTestVerbosity(int newval) /* * Retrieve the TestExpress mode for the testing framework - Values: + Values: 0: Exhaustive run Tests should take as long as necessary 1: Full run. Default if HDF5TestExpress is not defined @@ -398,7 +398,7 @@ int SetTestVerbosity(int newval) sub-tests. The standard system for test times is a Linux machine running in NFS space (to catch tests that involve a great deal of disk I/O). - + Implementation: I think this can be easily implemented in the test library (libh5test.a) so that all tests can just call it to check the status of $HDF5TestExpress. diff --git a/test/tfile.c b/test/tfile.c index fd0f02c..19772ca 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1659,8 +1659,8 @@ test_file_getname(void) static void test_file_double_root_open(void) { - hid_t file1_id, file2_id; - hid_t grp1_id, grp2_id; + hid_t file1_id, file2_id; + hid_t grp1_id, grp2_id; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1698,8 +1698,8 @@ test_file_double_root_open(void) static void test_file_double_group_open(void) { - hid_t file1_id, file2_id; - hid_t grp1_id, grp2_id; + hid_t file1_id, file2_id; + hid_t grp1_id, grp2_id; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1737,9 +1737,9 @@ test_file_double_group_open(void) static void test_file_double_dataset_open(void) { - hid_t file1_id, file2_id; - hid_t dset1_id, dset2_id; - hid_t space_id; + hid_t file1_id, file2_id; + hid_t dset1_id, dset2_id; + hid_t space_id; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1785,8 +1785,8 @@ test_file_double_dataset_open(void) static void test_file_double_datatype_open(void) { - hid_t file1_id, file2_id; - hid_t type1_id, type2_id; + hid_t file1_id, file2_id; + hid_t type1_id, type2_id; herr_t ret; /* Generic return value */ /* Output message about test being performed */ diff --git a/test/tselect.c b/test/tselect.c index a8f199f..030d8b7 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -147,7 +147,7 @@ #define SPACERE3_RANK 3 #define SPACERE3_DIM0 8 #define SPACERE3_DIM1 12 -#define SPACERE3_DIM2 8 +#define SPACERE3_DIM2 8 #define SPACERE4_RANK 4 #define SPACERE4_DIM0 8 #define SPACERE4_DIM1 12 @@ -6558,8 +6558,8 @@ test_shape_same(void) ** ** test_space_rebuild(): Tests selection rebuild routine, ** We will test whether selection in span-tree form can be rebuilt -** into a regular selection. -** +** into a regular selection. +** ** ****************************************************************/ static void @@ -6567,12 +6567,12 @@ test_space_rebuild(void) { /* regular space IDs in span-tree form */ - hid_t sid_reg1,sid_reg2,sid_reg3,sid_reg4,sid_reg5; - - /* Original regular Space IDs */ - hid_t sid_reg_ori1,sid_reg_ori2,sid_reg_ori3,sid_reg_ori4,sid_reg_ori5; + hid_t sid_reg1,sid_reg2,sid_reg3,sid_reg4,sid_reg5; + + /* Original regular Space IDs */ + hid_t sid_reg_ori1,sid_reg_ori2,sid_reg_ori3,sid_reg_ori4,sid_reg_ori5; - /* Irregular space IDs */ + /* Irregular space IDs */ hid_t sid_irreg1,sid_irreg2,sid_irreg3,sid_irreg4,sid_irreg5; /* rebuild status state */ @@ -6589,22 +6589,22 @@ test_space_rebuild(void) /* The start of the hyperslab */ hsize_t start1[SPACERE1_RANK],start2[SPACERE2_RANK], start3[SPACERE3_RANK],start4[SPACERE4_RANK], - start5[SPACERE5_RANK]; + start5[SPACERE5_RANK]; /* The stride of the hyperslab */ hsize_t stride1[SPACERE1_RANK],stride2[SPACERE2_RANK], stride3[SPACERE3_RANK],stride4[SPACERE4_RANK], - stride5[SPACERE5_RANK]; + stride5[SPACERE5_RANK]; /* The number of blocks for the hyperslab */ hsize_t count1[SPACERE1_RANK],count2[SPACERE2_RANK], count3[SPACERE3_RANK],count4[SPACERE4_RANK], - count5[SPACERE5_RANK]; + count5[SPACERE5_RANK]; /* The size of each block for the hyperslab */ hsize_t block1[SPACERE1_RANK],block2[SPACERE2_RANK], block3[SPACERE3_RANK],block4[SPACERE4_RANK], - block5[SPACERE5_RANK]; + block5[SPACERE5_RANK]; /* Declarations for special test of rebuild */ hid_t sid_spec; @@ -6612,7 +6612,7 @@ test_space_rebuild(void) /* Output message about test being performed */ MESSAGE(6, ("Testing functionality to rebuild regular hyperslab selection\n")); - + MESSAGE(7, ("Testing functionality to rebuild 1-D hyperslab selection\n")); @@ -6621,7 +6621,7 @@ test_space_rebuild(void) sid_reg_ori1 = H5Screate_simple(SPACERE1_RANK,dims1,NULL); /* Build up the original one dimensional regular selection */ - start1[0] = 1; + start1[0] = 1; count1[0] = 3; stride1[0] = 5; block1[0] = 4; @@ -6631,19 +6631,19 @@ test_space_rebuild(void) /* Build up one dimensional regular selection with H5_SELECT_OR, inside HDF5, it will be treated as an irregular selection. */ - start1[0] = 1; + start1[0] = 1; count1[0] = 2; stride1[0] = 5; block1[0] = 4; ret = H5Sselect_hyperslab(sid_reg1,H5S_SELECT_SET,start1,stride1,count1,block1); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); - start1[0] = 11; + start1[0] = 11; count1[0] = 1; stride1[0] = 5; block1[0] = 4; ret = H5Sselect_hyperslab(sid_reg1,H5S_SELECT_OR,start1,stride1,count1,block1); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; rebuild_stat = H5S_get_rebuild_status_test(sid_reg1); @@ -6661,24 +6661,24 @@ test_space_rebuild(void) /* For irregular hyperslab */ sid_irreg1 = H5Screate_simple(SPACERE1_RANK,dims1,NULL); - + /* Build up one dimensional irregular selection with H5_SELECT_OR */ - start1[0] = 1; + start1[0] = 1; count1[0] = 2; stride1[0] = 5; block1[0] = 4; ret = H5Sselect_hyperslab(sid_irreg1,H5S_SELECT_SET,start1,stride1,count1,block1); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start1[0] = 12; /* Just one position switch */ count1[0] = 1; stride1[0] = 5; block1[0] = 4; ret = H5Sselect_hyperslab(sid_irreg1,H5S_SELECT_OR,start1,stride1,count1,block1); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = TRUE; - rebuild_stat = H5S_get_rebuild_status_test(sid_irreg1); + rebuild_stat = H5S_get_rebuild_status_test(sid_irreg1); assert(rebuild_stat!=FAIL); /* In this case, rebuild_stat should be FALSE. */ if(rebuild_stat){ @@ -6686,14 +6686,14 @@ test_space_rebuild(void) CHECK(ret,FAIL,"H5S_hyper_rebuild"); }/* No need to do shape comparision */ - + MESSAGE(7, ("Testing functionality to rebuild 2-D hyperslab selection\n")); /* Create 2-D dataspace */ sid_reg2 = H5Screate_simple(SPACERE2_RANK,dims2,NULL); sid_reg_ori2 = H5Screate_simple(SPACERE2_RANK,dims2,NULL); /* Build up the original two dimensional regular selection */ - start2[0] = 2; + start2[0] = 2; count2[0] = 2; stride2[0] = 7; block2[0] = 5; @@ -6714,7 +6714,7 @@ test_space_rebuild(void) block2[1] = 2; ret = H5Sselect_hyperslab(sid_reg2,H5S_SELECT_SET,start2,stride2,count2,block2); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start2[1] = 7; /* 7 = start(1) + count(2) * stride(3) */ count2[1] = 1; @@ -6722,10 +6722,10 @@ test_space_rebuild(void) block2[1] = 2; ret = H5Sselect_hyperslab(sid_reg2,H5S_SELECT_OR,start2,stride2,count2,block2); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; - rebuild_stat = H5S_get_rebuild_status_test(sid_reg2); + rebuild_stat = H5S_get_rebuild_status_test(sid_reg2); assert(rebuild_stat!=FAIL); /* In this case, rebuild_stat should be TRUE. */ if(!rebuild_stat){ @@ -6742,7 +6742,7 @@ test_space_rebuild(void) sid_irreg2 = H5Screate_simple(SPACERE2_RANK,dims2,NULL); /* Build up two dimensional irregular selection with H5_SELECT_OR */ - start2[0] = 2; + start2[0] = 2; count2[0] = 2; stride2[0] = 7; block2[0] = 5; @@ -6751,15 +6751,15 @@ test_space_rebuild(void) stride2[1] = 3; block2[1] = 2; ret = H5Sselect_hyperslab(sid_irreg2,H5S_SELECT_SET,start2,stride2,count2,block2); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start2[1] = 4; - count2[1] = 2; + count2[1] = 2; stride2[1] = 4; block2[1] = 3; /* Just add one element for the block */ - + ret = H5Sselect_hyperslab(sid_irreg2,H5S_SELECT_OR,start2,stride2,count2,block2); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = TRUE; rebuild_stat = H5S_get_rebuild_status_test(sid_irreg2); @@ -6777,7 +6777,7 @@ test_space_rebuild(void) sid_reg_ori3 = H5Screate_simple(SPACERE3_RANK,dims3,NULL); /* Build up the original three dimensional regular selection */ - start3[0] = 2; + start3[0] = 2; count3[0] = 2; stride3[0] = 3; block3[0] = 2; @@ -6790,7 +6790,7 @@ test_space_rebuild(void) count3[2] = 2; stride3[2] = 4; block3[2] = 2; - + ret = H5Sselect_hyperslab(sid_reg_ori3,H5S_SELECT_SET,start3,stride3,count3,block3); CHECK(ret, FAIL, "H5Sselect_hyperslab"); @@ -6803,7 +6803,7 @@ test_space_rebuild(void) block3[2] = 2; ret = H5Sselect_hyperslab(sid_reg3,H5S_SELECT_SET,start3,stride3,count3,block3); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start3[2] = 5; count3[2] = 1; @@ -6811,7 +6811,7 @@ test_space_rebuild(void) block3[2] = 2; ret = H5Sselect_hyperslab(sid_reg3,H5S_SELECT_OR,start3,stride3,count3,block3); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; rebuild_stat = H5S_get_rebuild_status_test(sid_reg3); @@ -6831,7 +6831,7 @@ test_space_rebuild(void) sid_irreg3 = H5Screate_simple(SPACERE3_RANK,dims3,NULL); /* Build up three dimensional irregular selection with H5_SELECT_OR */ - start3[0] = 2; + start3[0] = 2; count3[0] = 2; stride3[0] = 3; block3[0] = 2; @@ -6846,15 +6846,15 @@ test_space_rebuild(void) block3[2] = 1; ret = H5Sselect_hyperslab(sid_irreg3,H5S_SELECT_SET,start3,stride3,count3,block3); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start3[2] = 3; - count3[2] = 2; + count3[2] = 2; stride3[2] = 3; /* Just add one element for the stride */ - block3[2] = 1; - + block3[2] = 1; + ret = H5Sselect_hyperslab(sid_irreg3,H5S_SELECT_OR,start3,stride3,count3,block3); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = TRUE; rebuild_stat = H5S_get_rebuild_status_test(sid_irreg3); @@ -6872,7 +6872,7 @@ test_space_rebuild(void) sid_reg_ori4 = H5Screate_simple(SPACERE4_RANK,dims4,NULL); /* Build up the original four dimensional regular selection */ - start4[0] = 2; + start4[0] = 2; count4[0] = 2; stride4[0] = 3; block4[0] = 2; @@ -6891,7 +6891,7 @@ test_space_rebuild(void) count4[3] = 2; stride4[3] = 4; block4[3] = 2; - + ret = H5Sselect_hyperslab(sid_reg_ori4,H5S_SELECT_SET,start4,stride4,count4,block4); CHECK(ret, FAIL, "H5Sselect_hyperslab"); @@ -6904,7 +6904,7 @@ test_space_rebuild(void) block4[3] = 2; ret = H5Sselect_hyperslab(sid_reg4,H5S_SELECT_SET,start4,stride4,count4,block4); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start4[3] = 5; count4[3] = 1; @@ -6913,7 +6913,7 @@ test_space_rebuild(void) ret = H5Sselect_hyperslab(sid_reg4,H5S_SELECT_OR,start4,stride4,count4,block4); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; @@ -6932,9 +6932,9 @@ test_space_rebuild(void) /* Testing irregular selection */ sid_irreg4 = H5Screate_simple(SPACERE4_RANK,dims4,NULL); - + /* Build up four dimensional irregular selection with H5_SELECT_OR */ - start4[0] = 2; + start4[0] = 2; count4[0] = 2; stride4[0] = 3; block4[0] = 2; @@ -6954,7 +6954,7 @@ test_space_rebuild(void) block4[3] = 2; /* sub-block is one element difference */ ret = H5Sselect_hyperslab(sid_irreg4,H5S_SELECT_SET,start4,stride4,count4,block4); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start4[2] = 5; count4[2] = 1; @@ -6965,9 +6965,9 @@ test_space_rebuild(void) count4[3] = 2; stride4[3] = 4; block4[3] = 3; /* sub-block is one element difference */ - + ret = H5Sselect_hyperslab(sid_irreg4,H5S_SELECT_OR,start4,stride4,count4,block4); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = TRUE; rebuild_stat = H5S_get_rebuild_status_test(sid_irreg4); @@ -6985,7 +6985,7 @@ test_space_rebuild(void) sid_reg_ori5 = H5Screate_simple(SPACERE5_RANK,dims5,NULL); /* Build up the original five dimensional regular selection */ - start5[0] = 2; + start5[0] = 2; count5[0] = 2; stride5[0] = 3; block5[0] = 2; @@ -7004,7 +7004,7 @@ test_space_rebuild(void) count5[3] = 2; stride5[3] = 4; block5[3] = 2; - + start5[4] = 1; count5[4] = 2; stride5[4] = 4; @@ -7021,7 +7021,7 @@ test_space_rebuild(void) block5[4] = 2; ret = H5Sselect_hyperslab(sid_reg5,H5S_SELECT_SET,start5,stride5,count5,block5); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start5[4] = 5; count5[4] = 1; @@ -7030,7 +7030,7 @@ test_space_rebuild(void) ret = H5Sselect_hyperslab(sid_reg5,H5S_SELECT_OR,start5,stride5,count5,block5); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; @@ -7048,9 +7048,9 @@ test_space_rebuild(void) } sid_irreg5 = H5Screate_simple(SPACERE5_RANK,dims5,NULL); - + /* Build up five dimensional irregular selection with H5_SELECT_OR */ - start5[0] = 2; + start5[0] = 2; count5[0] = 2; stride5[0] = 3; block5[0] = 2; @@ -7068,15 +7068,15 @@ test_space_rebuild(void) start5[3] = 1; count5[3] = 1; stride5[3] = 4; - block5[3] = 2; + block5[3] = 2; start5[4] = 2; /* One element difference */ count5[4] = 1; stride5[4] = 4; - block5[4] = 2; + block5[4] = 2; ret = H5Sselect_hyperslab(sid_irreg5,H5S_SELECT_SET,start5,stride5,count5,block5); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); start5[3] = 5; count5[3] = 1; @@ -7086,10 +7086,10 @@ test_space_rebuild(void) start5[4] = 1; /* One element difference */ count5[4] = 2; stride5[4] = 4; - block5[4] = 2; - + block5[4] = 2; + ret = H5Sselect_hyperslab(sid_irreg5,H5S_SELECT_OR,start5,stride5,count5,block5); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = TRUE; rebuild_stat = H5S_get_rebuild_status_test(sid_irreg5); @@ -7100,12 +7100,12 @@ test_space_rebuild(void) CHECK(ret,FAIL,"H5S_hyper_rebuild"); }/* No need to do shape comparision */ - /* We use 5-D to test a special case with + /* We use 5-D to test a special case with rebuilding routine TRUE, FALSE and TRUE */ sid_spec = H5Screate_simple(SPACERE5_RANK,dims5,NULL); /* Build up the original five dimensional regular selection */ - start5[0] = 2; + start5[0] = 2; count5[0] = 2; stride5[0] = 3; block5[0] = 2; @@ -7124,7 +7124,7 @@ test_space_rebuild(void) count5[3] = 2; stride5[3] = 4; block5[3] = 2; - + start5[4] = 1; count5[4] = 1; stride5[4] = 4; @@ -7133,7 +7133,7 @@ test_space_rebuild(void) ret = H5Sselect_hyperslab(sid_spec,H5S_SELECT_SET,start5,stride5,count5,block5); CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; - rebuild_stat = H5S_get_rebuild_status_test(sid_spec); + rebuild_stat = H5S_get_rebuild_status_test(sid_spec); /* In this case, rebuild_stat should be TRUE. */ if(!rebuild_stat){ ret = FAIL; @@ -7145,14 +7145,14 @@ test_space_rebuild(void) count5[3] = 1; stride5[3] = 4; block5[3] = 2; - + start5[4] = 5; count5[4] = 1; stride5[4] = 4; block5[4] = 2; ret = H5Sselect_hyperslab(sid_spec,H5S_SELECT_OR,start5,stride5,count5,block5); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = TRUE; rebuild_stat = H5S_get_rebuild_status_test(sid_spec); @@ -7167,14 +7167,14 @@ test_space_rebuild(void) count5[3] = 1; stride5[3] = 4; block5[3] = 2; - + start5[4] = 5; count5[4] = 1; stride5[4] = 4; block5[4] = 2; ret = H5Sselect_hyperslab(sid_spec,H5S_SELECT_OR,start5,stride5,count5,block5); - CHECK(ret, FAIL, "H5Sselect_hyperslab"); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); rebuild_stat = FALSE; rebuild_stat = H5S_get_rebuild_status_test(sid_spec); @@ -7213,8 +7213,8 @@ test_space_rebuild(void) H5Sclose(sid_spec); CHECK(ret, FAIL, "H5Sclose"); -} - +} + /**************************************************************** ** @@ -7868,10 +7868,10 @@ test_select(void) /* Test "same shape" routine */ test_shape_same(); - + /* Test "re-build" routine */ test_space_rebuild(); - + /* Test point selections in chunked datasets */ test_select_point_chunk(); diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c index 987c145..4f6a531 100644 --- a/test/ttsafe_acreate.c +++ b/test/ttsafe_acreate.c @@ -135,7 +135,7 @@ void tts_acreate(void) TestErrPrintf("unable to open appropriate attribute. Test failed!\n"); else { ret = H5Aread(attribute, H5T_NATIVE_INT, &buffer); - + if (ret < 0 || buffer != i) TestErrPrintf("wrong data values. Test failed!\n"); diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index e2f7cce..8204b11 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -148,7 +148,7 @@ void *tts_cancel_thread(void UNUSED *arg) cleanup_structure->datatype = datatype; cleanup_structure->dataspace = dataspace; pthread_cleanup_push(cancellation_cleanup, cleanup_structure); - + datavalue = 1; ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue); @@ -177,7 +177,7 @@ void *tts_cancel_thread(void UNUSED *arg) * execute the cleanup routine. */ pthread_cleanup_pop(0); - + return NULL; } diff --git a/test/tvltypes.c b/test/tvltypes.c index a12de08..e3a7160 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -194,7 +194,7 @@ test_vltypes_funcs(void) size=H5Tget_ebias(type); CHECK(size, FAIL, "H5Tget_ebias"); - + ret=H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); CHECK(ret, FAIL, "H5Tset_pad"); @@ -206,7 +206,7 @@ test_vltypes_funcs(void) ret=H5Tset_offset(type, 16); CHECK(ret, FAIL, "H5Tset_offset"); - + H5E_BEGIN_TRY { cset=H5Tget_cset(type); } H5E_END_TRY; |