diff options
| author | github-actions <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 03:13:15 (GMT) |
|---|---|---|
| committer | github-actions <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 03:13:15 (GMT) |
| commit | 4baa3786086c6cb68d69b72e9517c6b813bde3d7 (patch) | |
| tree | b6ca8dab0f3df9dda675a6f1356a6c12fd706ed5 /test | |
| parent | e4912d2877ae0f2accf90288bff69f907bf5b3a4 (diff) | |
| download | hdf5-4baa3786086c6cb68d69b72e9517c6b813bde3d7.zip hdf5-4baa3786086c6cb68d69b72e9517c6b813bde3d7.tar.gz hdf5-4baa3786086c6cb68d69b72e9517c6b813bde3d7.tar.bz2 | |
Committing clang-format changes
Diffstat (limited to 'test')
68 files changed, 788 insertions, 860 deletions
diff --git a/test/accum.c b/test/accum.c index 5e1f44d..a65e330 100644 --- a/test/accum.c +++ b/test/accum.c @@ -2371,14 +2371,14 @@ accum_printf(const H5F_t *f) fprintf(stdout, " start of accumulated data, loc = %" PRIuHADDR "\n", accum->loc); if (accum->dirty) { fprintf(stdout, " start of dirty region, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->dirty_off)); + (haddr_t)(accum->loc + accum->dirty_off)); fprintf(stdout, " end of dirty region, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->dirty_off + accum->dirty_len)); + (haddr_t)(accum->loc + accum->dirty_off + accum->dirty_len)); } /* end if */ fprintf(stdout, " end of accumulated data, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->size)); + (haddr_t)(accum->loc + accum->size)); fprintf(stdout, " end of accumulator allocation, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->alloc_size)); + (haddr_t)(accum->loc + accum->alloc_size)); printf("=====================================================\n"); } printf("\n\n"); @@ -600,17 +600,17 @@ static void usage(void) { fprintf(stdout, - "Usage: big [-h] [-c] [-fsize <fsize>}\n" - "\t-h\tPrint the help page\n" - "\t-c\tFile system Checking skipped. Caution: this test generates\n" - "\t\tmany big files and may fill up the file system.\n" - "\t-fsize\tChange family size default to <fsize> where <fsize> is\n" - "\t\ta positive float point number. Default value is %" PRIuHSIZE ".\n" - "Examples:\n" - "\t big -fsize 2.1e9 \t# test with file size just under 2GB\n" - "\t big -fsize 2.2e9 \t# test with file size just above 2GB\n" - "\t Be sure the file system can support the file size requested\n", - (hsize_t)FAMILY_SIZE); + "Usage: big [-h] [-c] [-fsize <fsize>}\n" + "\t-h\tPrint the help page\n" + "\t-c\tFile system Checking skipped. Caution: this test generates\n" + "\t\tmany big files and may fill up the file system.\n" + "\t-fsize\tChange family size default to <fsize> where <fsize> is\n" + "\t\ta positive float point number. Default value is %" PRIuHSIZE ".\n" + "Examples:\n" + "\t big -fsize 2.1e9 \t# test with file size just under 2GB\n" + "\t big -fsize 2.2e9 \t# test with file size just above 2GB\n" + "\t Be sure the file system can support the file size requested\n", + (hsize_t)FAMILY_SIZE); } static int diff --git a/test/bittests.c b/test/bittests.c index 43ec56d..44ce9d8 100644 --- a/test/bittests.c +++ b/test/bittests.c @@ -198,8 +198,8 @@ test_copy(void) if (size > 0 && n != (ssize_t)d_offset) { H5_FAILED(); printf(" Unable to find first copied bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -211,8 +211,8 @@ test_copy(void) if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) { H5_FAILED(); printf(" Unable to find last copied bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (d_offset + size == 8 * sizeof(v2) && n >= 0) { @@ -229,8 +229,8 @@ test_copy(void) if (size > 0 && (size_t)(n + 1) != d_offset + size) { H5_FAILED(); printf(" Unable to find last copied bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -242,8 +242,8 @@ test_copy(void) if (d_offset > 0 && n + 1 != (ssize_t)d_offset) { H5_FAILED(); printf(" Unable to find beginning of copied data " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == d_offset && n >= 0) { @@ -258,7 +258,7 @@ test_copy(void) failed: printf(" i=%d, s_offset=%lu, d_offset=%lu, size=%lu\n", i, (unsigned long)s_offset, - (unsigned long)d_offset, (unsigned long)size); + (unsigned long)d_offset, (unsigned long)size); printf(" s = 0x"); for (j = sizeof(v1) - 1; j >= 0; --j) printf("%02x", v1[j]); @@ -314,8 +314,8 @@ test_shift(void) if (n != (ssize_t)offset + shift_dist) { H5_FAILED(); printf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -327,8 +327,8 @@ test_shift(void) if (n != (ssize_t)(offset + size - 1)) { H5_FAILED(); printf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } @@ -343,8 +343,8 @@ test_shift(void) if ((size_t)n != offset) { H5_FAILED(); printf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -356,8 +356,8 @@ test_shift(void) if (n != (ssize_t)(offset + size) - shift_dist - 1) { H5_FAILED(); printf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } @@ -380,8 +380,8 @@ test_shift(void) if (n >= 0) { H5_FAILED(); printf(" Unable to verify all bits are zero in destination(LSB) " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -390,8 +390,8 @@ test_shift(void) if (n >= 0) { H5_FAILED(); printf(" Unable to verify all bits are zero in destination(MSB) " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } } @@ -400,8 +400,8 @@ test_shift(void) return 0; failed: - printf(" i=%d, offset=%lu, size=%lu, shift_dist=%lu\n", i, (unsigned long)offset, - (unsigned long)size, (unsigned long)shift_dist); + printf(" i=%d, offset=%lu, size=%lu, shift_dist=%lu\n", i, (unsigned long)offset, (unsigned long)size, + (unsigned long)shift_dist); for (j = sizeof(vector) - 1; j >= 0; --j) printf("%02x", vector[j]); printf("\n"); @@ -455,15 +455,15 @@ test_increment(void) if (size != 1 && (size_t)n != offset + size - 1) { H5_FAILED(); printf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (size == 1 && n >= 0) { H5_FAILED(); printf(" Unable to verify all-zero bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -475,15 +475,15 @@ test_increment(void) if (size != 1 && n != (ssize_t)(offset + size - 1)) { H5_FAILED(); printf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (size == 1 && n >= 0) { H5_FAILED(); printf(" Unable to verify all-zero bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } } @@ -543,8 +543,8 @@ test_decrement(void) if ((size_t)n != offset) { H5_FAILED(); printf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -556,8 +556,8 @@ test_decrement(void) if (n != (ssize_t)(offset + size - 1)) { H5_FAILED(); printf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } } @@ -617,8 +617,8 @@ test_negate(void) if ((size_t)n != offset) { H5_FAILED(); printf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -630,8 +630,8 @@ test_negate(void) if (n != (ssize_t)(offset + size - 1)) { H5_FAILED(); printf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } @@ -647,8 +647,8 @@ test_negate(void) if (n >= 0) { H5_FAILED(); printf(" Unable to verify all-zero bits in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } @@ -660,8 +660,8 @@ test_negate(void) if (n >= 0) { H5_FAILED(); printf(" Unable to verify all-zero bits in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } } @@ -730,8 +730,8 @@ test_set(void) if (size > 0 && n != (ssize_t)d_offset) { H5_FAILED(); printf(" Unable to find first set bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -743,8 +743,8 @@ test_set(void) if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) { H5_FAILED(); printf(" Unable to find last set bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (d_offset + size == 8 * sizeof(v2) && n >= 0) { @@ -761,8 +761,8 @@ test_set(void) if (size > 0 && (size_t)(n + 1) != d_offset + size) { H5_FAILED(); printf(" Unable to find last set bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -774,8 +774,8 @@ test_set(void) if (d_offset > 0 && n + 1 != (ssize_t)d_offset) { H5_FAILED(); printf(" Unable to find beginning of set bit region " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == d_offset && n >= 0) { @@ -850,8 +850,8 @@ test_clear(void) if (size > 0 && n != (ssize_t)d_offset) { H5_FAILED(); printf(" Unable to find first cleared bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -863,8 +863,8 @@ test_clear(void) if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) { H5_FAILED(); printf(" Unable to find last cleared bit in destination " - "(n=%d)\n", - (int)n); + "(n=%d)\n", + (int)n); goto failed; } if (d_offset + size == 8 * sizeof(v2) && n >= 0) { @@ -881,8 +881,8 @@ test_clear(void) if (size > 0 && (size_t)(n + 1) != d_offset + size) { H5_FAILED(); printf(" Unable to find last cleared bit in destination " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -894,8 +894,8 @@ test_clear(void) if (d_offset > 0 && n + 1 != (ssize_t)d_offset) { H5_FAILED(); printf(" Unable to find beginning of cleared bit region " - "(reverse, n=%d)\n", - (int)n); + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == d_offset && n >= 0) { diff --git a/test/cache.c b/test/cache.c index 399f7a5..e1ee26c 100644 --- a/test/cache.c +++ b/test/cache.c @@ -2038,8 +2038,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 4 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2073,8 +2072,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 6 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2107,7 +2105,7 @@ smoke_check_9(int express_test, unsigned paged) if (show_progress) /* 8 */ fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled \n", __func__, mile_stone++, - (int)pass); + (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2139,8 +2137,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 10 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -2164,8 +2161,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 12 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2202,8 +2198,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 15 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2230,8 +2225,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 17 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); @@ -2340,8 +2334,7 @@ smoke_check_10(int express_test, unsigned paged) cache_ptr = file_ptr->shared->cache; if (show_progress) /* 3 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2373,8 +2366,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 5 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2406,8 +2398,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 7 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2439,8 +2430,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 9 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -2464,8 +2454,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 11 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2492,8 +2481,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 13 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -2517,8 +2505,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 15 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2545,8 +2532,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 17 */ - fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); @@ -4495,8 +4481,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int (spec[u].entry_index > max_indices[spec[u].entry_type])) { pass = FALSE; - snprintf(msg, (size_t)128, "bad data in spec[%u] on entry to multi entry test #%d.", u, - test_num); + snprintf(msg, (size_t)128, "bad data in spec[%u] on entry to multi entry test #%d.", u, test_num); failure_mssg = msg; } u++; @@ -4528,7 +4513,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int if (!pass) { snprintf(msg, (size_t)128, "flush with flags 0x%x failed in multi entry test #%d.", flush_flags, - test_num); + test_num); failure_mssg = msg; } } @@ -4557,7 +4542,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int pass = FALSE; snprintf(msg, (size_t)128, "Bad status on entry %u after flush in multi entry test #%d.", u, - test_num); + test_num); failure_mssg = msg; } u++; @@ -4572,7 +4557,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size after flush in multi entry test #%d.", - test_num); + test_num); failure_mssg = msg; } } @@ -4592,7 +4577,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in multi entry test #%d.", - test_num); + test_num); failure_mssg = msg; } } @@ -4683,7 +4668,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i pass = FALSE; snprintf(msg, (size_t)128, "bad data in spec[%u] on entry to pe multi entry test #%d.", u, - test_num); + test_num); failure_mssg = msg; } u++; @@ -4720,7 +4705,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i if (!pass) { snprintf(msg, (size_t)128, "flush with flags 0x%x failed in pe multi entry test #%d.", - flush_flags, test_num); + flush_flags, test_num); failure_mssg = msg; } } @@ -4750,7 +4735,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i pass = FALSE; snprintf(msg, (size_t)128, "Bad status on entry %u after flush in pe multi entry test #%d.", u, - test_num); + test_num); failure_mssg = msg; } u++; @@ -4765,7 +4750,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size after flush in pe multi entry test #%d.", - test_num); + test_num); failure_mssg = msg; } } @@ -4784,8 +4769,8 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { pass = FALSE; - snprintf(msg, (size_t)128, - "Unexpected cache len/size after cleanup in pe multi entry test #%d.", test_num); + snprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in pe multi entry test #%d.", + test_num); failure_mssg = msg; } } @@ -8131,7 +8116,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size before flush in flush op test #%d.", - test_num); + test_num); failure_mssg = msg; } } @@ -8144,7 +8129,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu pass = FALSE; snprintf(msg, (size_t)128, "flush with flags 0x%x failed in flush op test #%d.", flush_flags, - test_num); + test_num); failure_mssg = msg; } } @@ -8189,8 +8174,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu if (check[i].in_cache != entry_in_cache(cache_ptr, check[i].entry_type, check[i].entry_index)) { pass = FALSE; - snprintf(msg, (size_t)128, "Check1 failed on entry %d after flush op test #%d.", i, - test_num); + snprintf(msg, (size_t)128, "Check1 failed on entry %d after flush op test #%d.", i, test_num); failure_mssg = msg; } @@ -8313,8 +8297,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu } #endif pass = FALSE; - snprintf(msg, (size_t)128, "Check2 failed on entry %d after flush op test #%d.", i, - test_num); + snprintf(msg, (size_t)128, "Check2 failed on entry %d after flush op test #%d.", i, test_num); failure_mssg = msg; } i++; @@ -8331,7 +8314,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size after flush in flush op test #%d.", - test_num); + test_num); failure_mssg = msg; } } @@ -8350,8 +8333,8 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (cache_ptr->clean_index_size != 0) || (cache_ptr->dirty_index_size != 0)) { pass = FALSE; - snprintf(msg, (size_t)128, - "Unexpected cache len/size/cs/ds after cleanup in flush op test #%d.", test_num); + snprintf(msg, (size_t)128, "Unexpected cache len/size/cs/ds after cleanup in flush op test #%d.", + test_num); failure_mssg = msg; } } @@ -12236,8 +12219,8 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty if (!pass) { /* construct and set actual failure message */ - snprintf(msg, (size_t)128, "flush with flags 0x%x failed in single entry test #%d.", - flush_flags, test_num); + snprintf(msg, (size_t)128, "flush with flags 0x%x failed in single entry test #%d.", flush_flags, + test_num); failure_mssg = msg; } @@ -12258,7 +12241,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty #endif pass = FALSE; snprintf(msg, (size_t)128, "Unexpected entry status after flush in single entry test #%d.", - test_num); + test_num); failure_mssg = msg; } else if ((((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) == 0) && @@ -12268,7 +12251,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size after flush in single entry test #%d.", - test_num); + test_num); failure_mssg = msg; } } @@ -12287,7 +12270,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty pass = FALSE; snprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in single entry test #%d.", - test_num); + test_num); failure_mssg = msg; } else { @@ -12351,8 +12334,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { pass = FALSE; - snprintf(msg, (size_t)128, "cache not empty at beginning of pinned single entry test #%d.", - test_num); + snprintf(msg, (size_t)128, "cache not empty at beginning of pinned single entry test #%d.", test_num); failure_mssg = msg; } else if ((entry_type < 0) || (entry_type >= NUMBER_OF_ENTRY_TYPES) || (entry_idx < 0) || @@ -12397,7 +12379,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e if (!pass) { /* construct and set the correct failure message */ snprintf(msg, (size_t)128, "flush with flags 0x%x failed in pinned single entry test #%d.", - flush_flags, test_num); + flush_flags, test_num); failure_mssg = msg; } else if ((entry_ptr->deserialized != expected_deserialized) || @@ -12415,8 +12397,8 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e (int)expected_destroyed); #endif pass = FALSE; - snprintf(msg, (size_t)128, - "Unexpected entry status after flush in pinned single entry test #%d.", test_num); + snprintf(msg, (size_t)128, "Unexpected entry status after flush in pinned single entry test #%d.", + test_num); failure_mssg = msg; } else if ((((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) == 0) && @@ -12426,7 +12408,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e pass = FALSE; snprintf(msg, (size_t)128, - "Unexpected cache len/size after flush in pinned single entry test #%d.", test_num); + "Unexpected cache len/size after flush in pinned single entry test #%d.", test_num); failure_mssg = msg; } } @@ -12454,15 +12436,14 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e if (!pass) { - snprintf(msg, (size_t)128, "Flush failed on cleanup in pinned single entry test #%d.", - test_num); + snprintf(msg, (size_t)128, "Flush failed on cleanup in pinned single entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { pass = FALSE; snprintf(msg, (size_t)128, - "Unexpected cache len/size after cleanup in pinned single entry test #%d.", test_num); + "Unexpected cache len/size after cleanup in pinned single entry test #%d.", test_num); failure_mssg = msg; } else { @@ -13565,7 +13546,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry pass = FALSE; snprintf(msg, (size_t)128, "Pinned entry not in pel after move in test #%u.", - test_num); + test_num); failure_mssg = msg; } } /* end else */ @@ -13588,8 +13569,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if ((entry_ptr->header.prev != NULL) || (cache_ptr->LRU_head_ptr != (H5C_cache_entry_t *)entry_ptr)) { pass = FALSE; - snprintf(msg, (size_t)128, "Entry not at head of LRU after move in test #%u.", - test_num); + snprintf(msg, (size_t)128, "Entry not at head of LRU after move in test #%u.", test_num); failure_mssg = msg; } } /* end else */ @@ -13599,8 +13579,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (!(entry_ptr->header.is_protected)) { pass = FALSE; - snprintf(msg, (size_t)128, "Protected entry not protected after move in test #%u.", - test_num); + snprintf(msg, (size_t)128, "Protected entry not protected after move in test #%u.", test_num); failure_mssg = msg; } @@ -13612,7 +13591,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry pass = FALSE; snprintf(msg, (size_t)128, "Unprotected entry not unprotected after move in test #%u.", - test_num); + test_num); failure_mssg = msg; } } /* end else */ diff --git a/test/cache_api.c b/test/cache_api.c index 4275d82..6184608 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -1500,8 +1500,7 @@ init_invalid_configs(void) H5AC_cache_config_t *configs = NULL; /* Allocate memory */ - if (NULL == - (configs = (H5AC_cache_config_t *)calloc(NUM_INVALID_CONFIGS, sizeof(H5AC_cache_config_t)))) { + if (NULL == (configs = (H5AC_cache_config_t *)calloc(NUM_INVALID_CONFIGS, sizeof(H5AC_cache_config_t)))) { return NULL; } diff --git a/test/cache_common.c b/test/cache_common.c index b20acea..09b02de 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -720,10 +720,10 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb if ((*(((const char *)image) + 2)) != (char)(idx & 0xFF)) { fprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr); fprintf(stdout, "*image = 0x%" PRIx8 " 0x%" PRIx8 " 0x%" PRIx8 "\n", - (*((const uint8_t *)image)), (*(((const uint8_t *)image) + 1)), - (*(((const uint8_t *)image) + 2))); + (*((const uint8_t *)image)), (*(((const uint8_t *)image) + 1)), + (*(((const uint8_t *)image) + 2))); fprintf(stdout, "expected *image = 0x%02" PRIx32 "%02" PRIx32 "\n", (uint32_t)idx & 0xFF, - (((uint32_t)idx & 0xFF00) >> 8)); + (((uint32_t)idx & 0xFF00) >> 8)); } /* end if */ assert((*((const char *)image)) == (char)(type & 0xFF)); assert((*(((const char *)image) + 1)) == (char)((idx & 0xFF00) >> 8)); @@ -1907,8 +1907,7 @@ create_entry_arrays(void) /* variable entries */ if (NULL == (variable_entries = (test_entry_t *)calloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == - (orig_variable_entries = (test_entry_t *)calloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_variable_entries = (test_entry_t *)calloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) goto error; /* notify entries */ @@ -2337,8 +2336,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if ((!expected[i].in_cache) && (expected[i].is_dirty) && (!entry_ptr->expunged)) { pass = FALSE; - snprintf(msg, sizeof(msg), "%d: expected[%d] specs non-expunged, dirty, non-resident.\n", tag, - i); + snprintf(msg, sizeof(msg), "%d: expected[%d] specs non-expunged, dirty, non-resident.\n", tag, i); failure_mssg = msg; } @@ -2350,8 +2348,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) in cache actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, (int)in_cache, - (int)expected[i].in_cache); + (int)expected[i].entry_type, (int)expected[i].entry_index, (int)in_cache, + (int)expected[i].in_cache); failure_mssg = msg; } } @@ -2362,8 +2360,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) size actual/expected = %ld/%ld.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, (long)(entry_ptr->size), - (long)expected[i].size); + (int)expected[i].entry_type, (int)expected[i].entry_index, (long)(entry_ptr->size), + (long)expected[i].size); failure_mssg = msg; } } @@ -2373,9 +2371,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.size != expected[i].size) { pass = FALSE; - snprintf(msg, sizeof(msg), "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n", - tag, (int)expected[i].entry_type, (int)expected[i].entry_index, - (long)(entry_ptr->header.size), (long)expected[i].size); + snprintf(msg, sizeof(msg), "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n", tag, + (int)expected[i].entry_type, (int)expected[i].entry_index, + (long)(entry_ptr->header.size), (long)expected[i].size); failure_mssg = msg; } } @@ -2386,8 +2384,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->at_main_addr), (int)expected[i].at_main_addr); + (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->at_main_addr), (int)expected[i].at_main_addr); failure_mssg = msg; } } @@ -2398,8 +2396,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->is_dirty), (int)expected[i].is_dirty); + (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->is_dirty), (int)expected[i].is_dirty); failure_mssg = msg; } } @@ -2410,8 +2408,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n", - tag, (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->header.is_dirty), (int)expected[i].is_dirty); + tag, (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->header.is_dirty), (int)expected[i].is_dirty); failure_mssg = msg; } } @@ -2422,8 +2420,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->is_protected), (int)expected[i].is_protected); + (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->is_protected), (int)expected[i].is_protected); failure_mssg = msg; } } @@ -2433,10 +2431,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_protected != expected[i].is_protected) { pass = FALSE; - snprintf(msg, sizeof(msg), - "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->header.is_protected), (int)expected[i].is_protected); + snprintf(msg, sizeof(msg), "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n", + tag, (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->header.is_protected), (int)expected[i].is_protected); failure_mssg = msg; } } @@ -2447,8 +2444,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->is_pinned), (int)expected[i].is_pinned); + (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->is_pinned), (int)expected[i].is_pinned); failure_mssg = msg; } } @@ -2459,8 +2456,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) is_corked actual/expected = %d/%d.\n", tag, - (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->is_corked), (int)expected[i].is_corked); + (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->is_corked), (int)expected[i].is_corked); failure_mssg = msg; } } @@ -2471,8 +2468,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n", - tag, (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->header.is_pinned), (int)expected[i].is_pinned); + tag, (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->header.is_pinned), (int)expected[i].is_pinned); failure_mssg = msg; } } @@ -2485,11 +2482,11 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d,%d) deserialized = %d(%d), serialized = %d(%d), dest = %d(%d)\n", - tag, (int)expected[i].entry_type, (int)expected[i].entry_index, - (int)(entry_ptr->deserialized), (int)(expected[i].deserialized), - (int)(entry_ptr->serialized), (int)(expected[i].serialized), - (int)(entry_ptr->destroyed), (int)(expected[i].destroyed)); + "%d entry (%d,%d) deserialized = %d(%d), serialized = %d(%d), dest = %d(%d)\n", tag, + (int)expected[i].entry_type, (int)expected[i].entry_index, + (int)(entry_ptr->deserialized), (int)(expected[i].deserialized), + (int)(entry_ptr->serialized), (int)(expected[i].serialized), + (int)(entry_ptr->destroyed), (int)(expected[i].destroyed)); failure_mssg = msg; } } @@ -2500,9 +2497,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (pass) { if (entry_ptr->flush_dep_npar != expected[i].flush_dep_npar) { pass = FALSE; - snprintf(msg, sizeof(msg), "%d entry (%d, %d) flush_dep_npar actual/expected = %u/%u.\n", - tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_npar, - expected[i].flush_dep_npar); + snprintf(msg, sizeof(msg), "%d entry (%d, %d) flush_dep_npar actual/expected = %u/%u.\n", tag, + expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_npar, + expected[i].flush_dep_npar); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2510,9 +2507,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.flush_dep_nparents != expected[i].flush_dep_npar) { pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d, %d) header flush_dep_nparents actual/expected = %u/%u.\n", tag, - expected[i].entry_type, expected[i].entry_index, - entry_ptr->header.flush_dep_nparents, expected[i].flush_dep_npar); + "%d entry (%d, %d) header flush_dep_nparents actual/expected = %u/%u.\n", tag, + expected[i].entry_type, expected[i].entry_index, + entry_ptr->header.flush_dep_nparents, expected[i].flush_dep_npar); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2524,9 +2521,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->flush_dep_par_type[u] != expected[i].flush_dep_par_type[u]) { pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d, %d) flush_dep_par_type[%u] actual/expected = %d/%d.\n", tag, - expected[i].entry_type, expected[i].entry_index, u, - entry_ptr->flush_dep_par_type[u], expected[i].flush_dep_par_type[u]); + "%d entry (%d, %d) flush_dep_par_type[%u] actual/expected = %d/%d.\n", tag, + expected[i].entry_type, expected[i].entry_index, u, + entry_ptr->flush_dep_par_type[u], expected[i].flush_dep_par_type[u]); failure_mssg = msg; } /* end if */ } /* end for */ @@ -2536,9 +2533,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->flush_dep_par_idx[u] != expected[i].flush_dep_par_idx[u]) { pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d, %d) flush_dep_par_idx[%u] actual/expected = %d/%d.\n", tag, - expected[i].entry_type, expected[i].entry_index, u, - entry_ptr->flush_dep_par_idx[u], expected[i].flush_dep_par_idx[u]); + "%d entry (%d, %d) flush_dep_par_idx[%u] actual/expected = %d/%d.\n", tag, + expected[i].entry_type, expected[i].entry_index, u, + entry_ptr->flush_dep_par_idx[u], expected[i].flush_dep_par_idx[u]); failure_mssg = msg; } /* end if */ } /* end for */ @@ -2548,9 +2545,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (pass) { if (entry_ptr->flush_dep_nchd != expected[i].flush_dep_nchd) { pass = FALSE; - snprintf(msg, sizeof(msg), "%d entry (%d, %d) flush_dep_nchd actual/expected = %u/%u.\n", - tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_nchd, - expected[i].flush_dep_nchd); + snprintf(msg, sizeof(msg), "%d entry (%d, %d) flush_dep_nchd actual/expected = %u/%u.\n", tag, + expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_nchd, + expected[i].flush_dep_nchd); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2558,9 +2555,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.flush_dep_nchildren != expected[i].flush_dep_nchd) { pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d, %d) header flush_dep_nchildren actual/expected = %u/%u.\n", tag, - expected[i].entry_type, expected[i].entry_index, - entry_ptr->header.flush_dep_nchildren, expected[i].flush_dep_nchd); + "%d entry (%d, %d) header flush_dep_nchildren actual/expected = %u/%u.\n", tag, + expected[i].entry_type, expected[i].entry_index, + entry_ptr->header.flush_dep_nchildren, expected[i].flush_dep_nchd); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2568,9 +2565,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->flush_dep_ndirty_chd != expected[i].flush_dep_ndirty_chd) { pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d, %d) flush_dep_ndirty_chd actual/expected = %u/%u.\n", tag, - expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_ndirty_chd, - expected[i].flush_dep_ndirty_chd); + "%d entry (%d, %d) flush_dep_ndirty_chd actual/expected = %u/%u.\n", tag, + expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_ndirty_chd, + expected[i].flush_dep_ndirty_chd); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2578,9 +2575,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.flush_dep_ndirty_children != expected[i].flush_dep_ndirty_chd) { pass = FALSE; snprintf(msg, sizeof(msg), - "%d entry (%d, %d) header flush_dep_ndirty_children actual/expected = %u/%u.\n", - tag, expected[i].entry_type, expected[i].entry_index, - entry_ptr->header.flush_dep_ndirty_children, expected[i].flush_dep_ndirty_chd); + "%d entry (%d, %d) header flush_dep_ndirty_children actual/expected = %u/%u.\n", tag, + expected[i].entry_type, expected[i].entry_index, + entry_ptr->header.flush_dep_ndirty_children, expected[i].flush_dep_ndirty_chd); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2590,8 +2587,8 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (expected[i].flush_order >= 0 && entry_ptr->flush_order != (unsigned)expected[i].flush_order) { pass = FALSE; snprintf(msg, sizeof(msg), "%d entry (%d, %d) flush_order actual/expected = %u/%d.\n", tag, - expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_order, - expected[i].flush_order); + expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_order, + expected[i].flush_order); failure_mssg = msg; } /* end if */ } /* end if */ @@ -2779,8 +2776,8 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_ if (verbose) { fprintf(stdout, "%s: unexpected il/is/cis/dis = %lld/%lld/%lld/%lld.\n", __func__, - (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size), - (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size)); + (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size), + (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size)); } pass = FALSE; failure_mssg = "non zero index len/sizes after H5C_flush_cache() with invalidate."; @@ -3249,8 +3246,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) assert(entry_ptr->index == idx); assert(entry_ptr->type == type); assert(entry_ptr == entry_ptr->self); - assert((!(entry_ptr->is_protected)) || - ((entry_ptr->is_read_only) && (entry_ptr->ro_ref_count > 0))); + assert((!(entry_ptr->is_protected)) || ((entry_ptr->is_read_only) && (entry_ptr->ro_ref_count > 0))); cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG); @@ -3562,8 +3558,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t insert_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3574,8 +3569,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry(file_ptr, type, tmp_idx); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3586,8 +3580,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ /* (don't decrement tmp_idx) */ @@ -3598,8 +3591,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t move_entry(cache_ptr, type, tmp_idx, move_to_main_addr); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3610,8 +3602,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry(file_ptr, type, tmp_idx); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx -= 2; @@ -3622,8 +3613,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ if (do_mult_ro_protects) { @@ -3636,7 +3626,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry_ro(file_ptr, type, tmp_idx); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3648,7 +3638,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry_ro(file_ptr, type, tmp_idx); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3660,7 +3650,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry_ro(file_ptr, type, tmp_idx); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ /* (don't decrement tmp_idx) */ @@ -3672,7 +3662,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3684,7 +3674,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3696,7 +3686,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ } /* if ( do_mult_ro_protects ) */ @@ -3706,8 +3696,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry(file_ptr, type, idx); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx = idx - lag + 2; @@ -3718,8 +3707,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; @@ -3730,8 +3718,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t protect_entry(file_ptr, type, tmp_idx); - assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ if (do_destroys) { @@ -3745,7 +3732,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); break; case 1: @@ -3756,7 +3743,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ else { if (verbose) @@ -3766,7 +3753,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end else */ break; @@ -3777,7 +3764,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); break; case 3: @@ -3788,7 +3775,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ else { if (verbose) @@ -3799,7 +3786,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t H5C__DELETED_FLAG); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end else */ break; @@ -3819,7 +3806,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); assert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ } /* end elseif */ @@ -4822,10 +4809,10 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in assert(i < chd_entry_ptr->flush_dep_npar); if (i < chd_entry_ptr->flush_dep_npar - 1) memmove(&chd_entry_ptr->flush_dep_par_type[i], &chd_entry_ptr->flush_dep_par_type[i + 1], - (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_type[0])); + (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_type[0])); if (i < chd_entry_ptr->flush_dep_npar - 1) memmove(&chd_entry_ptr->flush_dep_par_idx[i], &chd_entry_ptr->flush_dep_par_idx[i + 1], - (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_idx[0])); + (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_idx[0])); chd_entry_ptr->flush_dep_npar--; par_entry_ptr->flush_dep_nchd--; if (par_entry_ptr->flush_dep_nchd == 0) { @@ -5040,7 +5027,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if ((pass) && (dump_data)) { fprintf(stdout, "cache_hits: %ld, cache_accesses: %ld, hit_rate: %lf\n", (long)cache_hits, - (long)cache_accesses, hit_rate); + (long)cache_accesses, hit_rate); } if ((pass) && (cache_accesses > min_accesses) && (hit_rate < min_hit_rate)) { @@ -5163,7 +5150,7 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c if ((pass) && (dump_data)) { fprintf(stdout, "max_sz: %ld, min_clean_sz: %ld, cur_sz: %ld, cur_ent: %ld\n", (long)max_size, - (long)min_clean_size, (long)cur_size, (long)cur_num_entries); + (long)min_clean_size, (long)cur_size, (long)cur_num_entries); } } /* check_and_validate_cache_size() */ diff --git a/test/cache_common.h b/test/cache_common.h index ef6ab4a..a8459bd 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -418,7 +418,7 @@ typedef struct test_entry_t { ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dirty_index_size)) || \ (!H5F_addr_defined(Addr)) || (H5C__HASH_FCN(Addr) < 0) || \ (H5C__HASH_FCN(Addr) >= H5C__HASH_TABLE_LEN)) { \ - fprintf(stdout, "Pre HT search SC failed.\n"); \ + fprintf(stdout, "Pre HT search SC failed.\n"); \ } #define H5C_TEST__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, k) \ @@ -430,13 +430,13 @@ typedef struct test_entry_t { ((((cache_ptr)->index)[k] == (entry_ptr)) && ((entry_ptr)->ht_prev != NULL)) || \ (((entry_ptr)->ht_prev != NULL) && ((entry_ptr)->ht_prev->ht_next != (entry_ptr))) || \ (((entry_ptr)->ht_next != NULL) && ((entry_ptr)->ht_next->ht_prev != (entry_ptr)))) { \ - fprintf(stdout, "Post successful HT search SC failed.\n"); \ + fprintf(stdout, "Post successful HT search SC failed.\n"); \ } #define H5C_TEST__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k) \ if (((cache_ptr) == NULL) || (((cache_ptr)->index)[k] != (entry_ptr)) || \ ((entry_ptr)->ht_prev != NULL)) { \ - fprintf(stdout, "Post HT shift to front failed.\n"); \ + fprintf(stdout, "Post HT shift to front failed.\n"); \ } #define H5C_TEST__SEARCH_INDEX(cache_ptr, Addr, entry_ptr) \ @@ -451,7 +451,7 @@ typedef struct test_entry_t { if (entry_ptr != ((cache_ptr)->index)[k]) { \ if ((entry_ptr)->ht_next) \ (entry_ptr)->ht_next->ht_prev = (entry_ptr)->ht_prev; \ - assert((entry_ptr)->ht_prev != NULL); \ + assert((entry_ptr)->ht_prev != NULL); \ (entry_ptr)->ht_prev->ht_next = (entry_ptr)->ht_next; \ ((cache_ptr)->index)[k]->ht_prev = (entry_ptr); \ (entry_ptr)->ht_next = ((cache_ptr)->index)[k]; \ diff --git a/test/cache_image.c b/test/cache_image.c index d23f139..660345f 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -325,10 +325,10 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (verbose) { fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l, - data_chunk[k][l], - ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); + data_chunk[k][l], + ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k, - l); + l); } } } @@ -1132,10 +1132,10 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (verbose) { fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l, - data_chunk[k][l], - ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); + data_chunk[k][l], + ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k, - l); + l); } } } @@ -4721,8 +4721,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - fprintf(stdout, "%s:L2 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 1, max_group, - pass); + fprintf(stdout, "%s:L2 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 1, max_group, pass); /* 7) Create a process specific group for this file open */ if (pass) { @@ -4740,16 +4739,14 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - fprintf(stdout, "%s:L3 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 2, max_group, - pass); + fprintf(stdout, "%s:L3 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 2, max_group, pass); /* 8) Construct a "zoo" in the above group, and validate it. */ if (pass) create_zoo(file_id, process_group_name, max_group); if (show_progress) - fprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 3, max_group, - pass); + fprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 3, max_group, pass); /* 9) Close the file. */ @@ -4772,8 +4769,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - fprintf(stdout, "%s:L5 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 4, max_group, - pass); + fprintf(stdout, "%s:L5 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 4, max_group, pass); } /* end while */ cp += 5; @@ -7663,7 +7659,7 @@ evict_on_close_test(hbool_t single_file_vfd) assert(cache_ptr->magic == H5C__H5C_T_MAGIC); fprintf(stdout, "index size / index dirty size = %lld / %lld\n", (long long)(cache_ptr->index_size), - (long long)(cache_ptr->dirty_index_size)); + (long long)(cache_ptr->dirty_index_size)); } if (show_progress) diff --git a/test/chunk_info.c b/test/chunk_info.c index 086c5dc..82d03e9 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -336,8 +336,8 @@ verify_selected_chunks(hid_t dset, hid_t plist, const hsize_t *start, const hsiz /* Verify that read chunk is the same as the corresponding written one */ if (memcmp(expected_buf[chk_index], read_buf, CHUNK_NX * CHUNK_NY) != 0) { fprintf(stderr, - "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n", - offset[0], offset[1]); + "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n", + offset[0], offset[1]); return FAIL; } } @@ -2095,7 +2095,7 @@ test_flt_msk_with_skip_compress(hid_t fapl) printf(" 1. Read different values than written."); printf(" At index %d,%d\n", ii, jj); printf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[ii][jj], - read_direct_buf[ii][jj]); + read_direct_buf[ii][jj]); TEST_ERROR; } diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index c397dec..e4b5683 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -218,16 +218,16 @@ test_compound(char *filename, hid_t fapl) goto error; if ((ret_code = H5Pget_preserve(PRESERVE)) != 0) { printf("Preserve status of dataset transfer property list should be" - " 0 (FALSE), got %d\n", - ret_code); + " 0 (FALSE), got %d\n", + ret_code); goto error; } if (H5Pset_preserve(PRESERVE, 1) < 0) goto error; if ((ret_code = H5Pget_preserve(PRESERVE)) != 1) { printf("Preserve status of dataset transfer property list should be" - " 1 (TRUE), got %d\n", - ret_code); + " 1 (TRUE), got %d\n", + ret_code); goto error; } @@ -529,10 +529,10 @@ test_compound(char *filename, hid_t fapl) s1[i].d != 8 * i + 6 || s1[i].e != 8 * i + 7) { H5_FAILED(); printf(" i==%u, row=%u, col=%u\n", i, i / NY, i % NY); - printf(" got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", s1[i].a, s1[i].b, s1[i].c[0], - s1[i].c[1], s1[i].c[2], s1[i].c[3], s1[i].d, s1[i].e); + printf(" got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", s1[i].a, s1[i].b, s1[i].c[0], s1[i].c[1], + s1[i].c[2], s1[i].c[3], s1[i].d, s1[i].e); printf(" ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", 8 * i + 0, 8 * i + 1, 8 * i + 2, - 8 * i + 3, 8 * i + 4, 8 * i + 5, 8 * i + 6, 8 * i + 7); + 8 * i + 3, 8 * i + 4, 8 * i + 5, 8 * i + 6, 8 * i + 7); goto error; } } @@ -1684,11 +1684,11 @@ error: int _i; \ H5_FAILED(); \ AT(); \ - printf(" Insertion order ="); \ + printf(" Insertion order ="); \ for (_i = 0; _i < PACK_NMEMBS; _i++) \ - printf(" %d", order[_i]); \ - printf("\n Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \ - fflush(stdout); \ + printf(" %d", order[_i]); \ + printf("\n Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \ + fflush(stdout); \ goto error; \ } diff --git a/test/cross_read.c b/test/cross_read.c index 9f9e1d1..d5b49a5 100644 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -106,7 +106,7 @@ check_data_i(const char *dsetname, hid_t fid) if (!nerrors++) { H5_FAILED(); printf("element [%d][%d] is %lld but should have been %lld\n", (int)i, (int)j, - data_out[i][j], data_in[i][j]); + data_out[i][j], data_in[i][j]); } /* end if */ /* Close/release resources. */ @@ -179,8 +179,8 @@ check_data_f(const char *dsetname, hid_t fid) if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], 0.001)) if (!nerrors++) { H5_FAILED(); - printf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j, - data_out[i][j], data_in[i][j]); + printf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j, data_out[i][j], + data_in[i][j]); } /* end if */ /* Close/release resources. */ diff --git a/test/direct_chunk.c b/test/direct_chunk.c index 77befab..4c6bac7 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -884,7 +884,7 @@ test_skip_compress_write2(hid_t file) printf(" 1. Read different values than written."); printf(" At index %d,%d\n", i, j); printf(" origin_direct_buf=%d, check_chunk=%d\n", origin_direct_buf[i][j], - check_chunk[i][j]); + check_chunk[i][j]); goto error; } } @@ -1092,13 +1092,13 @@ test_data_conv(hid_t file) printf(" 1. Read different values than written."); printf(" At index %d,%d\n", i, j); printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a, - (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], - (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, - (direct_buf[i][j]).e); + (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], + (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, + (direct_buf[i][j]).e); printf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (read_chunk[i][j]).a, - (read_chunk[i][j]).b, (read_chunk[i][j]).c[0], (read_chunk[i][j]).c[1], - (read_chunk[i][j]).c[2], (read_chunk[i][j]).c[3], (read_chunk[i][j]).d, - (read_chunk[i][j]).e); + (read_chunk[i][j]).b, (read_chunk[i][j]).c[0], (read_chunk[i][j]).c[1], + (read_chunk[i][j]).c[2], (read_chunk[i][j]).c[3], (read_chunk[i][j]).d, + (read_chunk[i][j]).e); goto error; } @@ -1135,12 +1135,12 @@ test_data_conv(hid_t file) printf(" 1. Read different values than written."); printf(" At index %d,%d\n", i, j); printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a, - (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], - (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, - (direct_buf[i][j]).e); + (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], + (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, + (direct_buf[i][j]).e); printf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", (check_chunk[i][j]).a, - (check_chunk[i][j]).c[0], (check_chunk[i][j]).c[1], (check_chunk[i][j]).c[2], - (check_chunk[i][j]).c[3], (check_chunk[i][j]).e); + (check_chunk[i][j]).c[0], (check_chunk[i][j]).c[1], (check_chunk[i][j]).c[2], + (check_chunk[i][j]).c[3], (check_chunk[i][j]).e); goto error; } diff --git a/test/dsets.c b/test/dsets.c index fd760b4..22ad1f4 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -2239,11 +2239,11 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, H5_FAILED(); fprintf(stderr, " Read different values than written.\n"); fprintf(stderr, " At index %lu,%lu\n", (unsigned long)((size_t)hs_offset[0] + i), - (unsigned long)((size_t)hs_offset[1] + j)); + (unsigned long)((size_t)hs_offset[1] + j)); fprintf(stderr, " At original: %d\n", - (int)points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); + (int)points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); fprintf(stderr, " At returned: %d\n", - (int)check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); + (int)check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); goto error; } } @@ -2949,7 +2949,7 @@ test_missing_filter(hid_t file) if (0 == (dset_size = H5Dget_storage_size(dsid))) { H5_FAILED(); printf(" Line %d: Error querying dataset size, dset_size=%lu\n", __LINE__, - (unsigned long)dset_size); + (unsigned long)dset_size); goto error; } /* end if */ @@ -3656,7 +3656,7 @@ test_nbit_array(hid_t file) H5_FAILED(); printf(" Read different values than written.\n"); printf(" At index %lu,%lu,%lu,%lu\n", (unsigned long)i, (unsigned long)j, - (unsigned long)m, (unsigned long)n); + (unsigned long)m, (unsigned long)n); goto error; } } @@ -4397,8 +4397,8 @@ test_nbit_compound_3(hid_t file) /* Check that the values read are the same as the values written */ for (i = 0; i < (size_t)size[0]; i++) { if (new_data[i].i != orig_data[i].i || strcmp(new_data[i].str, orig_data[i].str) != 0 || - strcmp(new_data[i].vl_str, orig_data[i].vl_str) != 0 || - new_data[i].v.len != orig_data[i].v.len || new_data[i].r != orig_data[i].r) { + strcmp(new_data[i].vl_str, orig_data[i].vl_str) != 0 || new_data[i].v.len != orig_data[i].v.len || + new_data[i].r != orig_data[i].r) { H5_FAILED(); printf(" Read different values than written.\n"); printf(" At index %lu\n", (unsigned long)i); @@ -7733,7 +7733,7 @@ test_missing_chunk(hid_t file) else { if (rdata[u] != wdata[u]) { printf(" Line %d: Incorrect value, wdata[%u]=%d, rdata[%u]=%d\n", __LINE__, (unsigned)u, - wdata[u], (unsigned)u, rdata[u]); + wdata[u], (unsigned)u, rdata[u]); TEST_ERROR; } /* end if */ } /* end else */ @@ -7746,15 +7746,15 @@ test_missing_chunk(hid_t file) if ((i % 10) >= 5 || (j % 10) >= 5) { if (rdata2[i][j] != 911) { printf(" Line %d: Incorrect value, rdata2[%u][%u] = %d\n", __LINE__, (unsigned)i, - (unsigned)j, rdata2[i][j]); + (unsigned)j, rdata2[i][j]); TEST_ERROR; } /* end if */ } /* end if */ else { if (rdata2[i][j] != wdata2[i][j]) { printf(" Line %d: Incorrect value, wdata2[%u][%u] = %d, rdata2[%u][%u] = %d\n", - __LINE__, (unsigned)i, (unsigned)j, wdata2[i][j], (unsigned)i, (unsigned)j, - rdata2[i][j]); + __LINE__, (unsigned)i, (unsigned)j, wdata2[i][j], (unsigned)i, (unsigned)j, + rdata2[i][j]); TEST_ERROR; } /* end if */ } /* end else */ @@ -8034,10 +8034,10 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < NPOINTS; i++) if (rbuf[i] != wbuf[i]) { - printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, - wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i], + (unsigned)i, rbuf[i]); printf(" coord[%u] = {%lu, %lu}\n", (unsigned)i, (unsigned long)coord[i][0], - (unsigned long)coord[i][1]); + (unsigned long)coord[i][1]); TEST_ERROR; } /* end if */ @@ -8176,8 +8176,8 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < NPOINTS; i++) if (rbuf[i] != wbuf[i]) { - printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, - wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i], + (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -8314,8 +8314,8 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < NPOINTS; i++) if (rbuf[i] != wbuf[i]) { - printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, - wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i], + (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -9055,8 +9055,7 @@ test_big_chunks_bypass_cache(hid_t fapl) h5_fixname(FILENAME[9], fapl, filename, sizeof filename); /* Set up data arrays */ - if (NULL == - (t_wdata_bytes = (int *)calloc((BYPASS_CHUNK_DIM / 2) * (BYPASS_CHUNK_DIM / 2), sizeof(int)))) + if (NULL == (t_wdata_bytes = (int *)calloc((BYPASS_CHUNK_DIM / 2) * (BYPASS_CHUNK_DIM / 2), sizeof(int)))) TEST_ERROR; if (NULL == (t_wdata = (int **)calloc((BYPASS_CHUNK_DIM / 2), sizeof(t_wdata_bytes)))) TEST_ERROR; @@ -9226,8 +9225,7 @@ test_big_chunks_bypass_cache(hid_t fapl) for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++) if (rdata1[i] != i) { printf(" Read different values than written in the 1st chunk.\n"); - printf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], - i); + printf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], i); TEST_ERROR } /* end if */ @@ -9235,7 +9233,7 @@ test_big_chunks_bypass_cache(hid_t fapl) if (rdata1[j] != fvalue) { printf(" Read different values than written in the 2nd chunk.\n"); printf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], - fvalue); + fvalue); TEST_ERROR } /* end if */ @@ -9244,8 +9242,8 @@ test_big_chunks_bypass_cache(hid_t fapl) for (j = 0; j < BYPASS_CHUNK_DIM / 2; j++) if (t_rdata1[i][j] != j) { printf(" Read different values than written in the 1st chunk.\n"); - printf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, - j, t_rdata1[i][j], j); + printf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, j, + t_rdata1[i][j], j); TEST_ERROR } /* end if */ @@ -9253,8 +9251,8 @@ test_big_chunks_bypass_cache(hid_t fapl) for (j = BYPASS_CHUNK_DIM / 2; j < BYPASS_DIM; j++) if (t_rdata1[i][j] != fvalue) { printf(" Read different values than written in the 2nd chunk.\n"); - printf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, - j, t_rdata1[i][j], fvalue); + printf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, j, + t_rdata1[i][j], fvalue); TEST_ERROR } /* end if */ @@ -9309,8 +9307,7 @@ test_big_chunks_bypass_cache(hid_t fapl) for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++) if (rdata2[i] != i) { printf(" Read different values than written in the chunk.\n"); - printf(" At line %d and index %d, rdata2 = %d. It should be %d.\n", __LINE__, i, rdata2[i], - i); + printf(" At line %d and index %d, rdata2 = %d. It should be %d.\n", __LINE__, i, rdata2[i], i); TEST_ERROR } /* end if */ @@ -9319,8 +9316,8 @@ test_big_chunks_bypass_cache(hid_t fapl) for (j = 0; j < BYPASS_CHUNK_DIM / 2; j++) if (t_rdata2[i][j] != j) { printf(" Read different values than written in the chunk.\n"); - printf(" At line %d and index (%d, %d), t_rdata2 = %d. It should be %d.\n", __LINE__, i, - j, t_rdata2[i][j], j); + printf(" At line %d and index (%d, %d), t_rdata2 = %d. It should be %d.\n", __LINE__, i, j, + t_rdata2[i][j], j); TEST_ERROR } /* end if */ @@ -11072,8 +11069,8 @@ test_fixed_array(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < POINTS; i++) if (rbuf[i] != wbuf[i]) { - printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, - (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, + wbuf[i], (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -11108,8 +11105,8 @@ test_fixed_array(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < POINTS; i++) if (rbuf[i] != wbuf[i]) { - printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, - (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, + wbuf[i], (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -11143,7 +11140,7 @@ test_fixed_array(hid_t fapl) for (i = 0; i < POINTS_BIG; i++) if (rbuf_big[i] != wbuf_big[i]) { printf(" Line %d: Incorrect value, wbuf_bif[%u]=%d, rbuf_big[%u]=%d\n", __LINE__, - (unsigned)i, wbuf_big[i], (unsigned)i, rbuf_big[i]); + (unsigned)i, wbuf_big[i], (unsigned)i, rbuf_big[i]); TEST_ERROR; } /* end if */ @@ -11430,8 +11427,8 @@ test_single_chunk(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < (DSET_DIM1 * DSET_DIM2); i++) if (rbuf[i] != wbuf[i]) { - printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, - (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, + wbuf[i], (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -11453,7 +11450,7 @@ test_single_chunk(hid_t fapl) for (i = 0; i < (DSET_TMP_DIM1 * DSET_TMP_DIM2); i++) if (t_rbuf[i] != t_wbuf[i]) { printf(" Line %d: Incorrect value, t_wbuf[%u]=%d, t_rbuf[%u]=%d\n", __LINE__, - (unsigned)i, t_wbuf[i], (unsigned)i, t_rbuf[i]); + (unsigned)i, t_wbuf[i], (unsigned)i, t_rbuf[i]); TEST_ERROR; } /* end if */ @@ -13227,8 +13224,8 @@ typedef struct scatter_info_t { if (ARR[i][j][k] != EXP[i][j][k]) { \ H5_FAILED(); \ AT(); \ - printf(" " #ARR "[%d][%d][%d] == %d, " #EXP "[%d][%d][%d] == %d\n", i, j, k, \ - ARR[i][j][k], i, j, k, EXP[i][j][k]); \ + printf(" " #ARR "[%d][%d][%d] == %d, " #EXP "[%d][%d][%d] == %d\n", i, j, k, \ + ARR[i][j][k], i, j, k, EXP[i][j][k]); \ goto error; \ } @@ -15420,7 +15417,7 @@ test_0sized_dset_metadata_alloc(hid_t fapl_id) /* Compose dataset name */ snprintf(dset_name, sizeof(dset_name), "/Dataset-%u-%u", (unsigned)alloc_time, - (unsigned)layout); + (unsigned)layout); /* Set up DCPL */ if ((dcpl_id_copy = H5Pcopy(dcpl_id)) < 0) diff --git a/test/dt_arith.c b/test/dt_arith.c index 81ce709..2f7f654 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -117,8 +117,8 @@ static int without_hardware_g = 0; NELMTS = SRC_PREC * 3; \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ buf_p = BUF; \ saved_p = SAVED; \ @@ -127,14 +127,14 @@ static int without_hardware_g = 0; /*VALUE2 ascends from 00000000, to 00000011, 00000111,..., until 11111111.*/ \ for (n = 0; n < SRC_PREC; n++) { \ { \ - memcpy(buf_p, &value1, SRC_SIZE); \ - memcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ { \ - memcpy(buf_p, &value2, SRC_SIZE); \ - memcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ @@ -153,8 +153,8 @@ static int without_hardware_g = 0; /* VALUE2 descends from 11111111 to 11111110, 11111100, ..., until 10000000. */ \ for (n = 0; n < SRC_PREC - 1; n++) { \ { \ - memcpy(buf_p, &value2, SRC_SIZE); \ - memcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ @@ -234,8 +234,8 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ buf_p = BUF; \ saved_p = SAVED; \ @@ -245,15 +245,15 @@ static int without_hardware_g = 0; value2 = -SRC_MIN; \ for (n = 0; n < num_norm; n++) { \ if (value1 < SRC_MAX) { /*positive*/ \ - memcpy(buf_p, &value1, SRC_SIZE); \ - memcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ value1 *= multiply; \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ if (value2 > -SRC_MAX) { /*negative*/ \ - memcpy(buf_p, &value2, SRC_SIZE); \ - memcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ value2 *= multiply; \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -261,14 +261,14 @@ static int without_hardware_g = 0; } \ \ value1 = SRC_MAX; /*maximal value*/ \ - memcpy(buf_p, &value1, SRC_SIZE); \ - memcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ \ value2 = -SRC_MAX; /*negative value*/ \ - memcpy(buf_p, &value2, SRC_SIZE); \ - memcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } @@ -289,25 +289,25 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ - tmp1 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ - tmp2 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ + tmp1 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ + tmp2 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ \ buf_p = BUF; \ saved_p = SAVED; \ \ /*Denormalized values. Exponent is 0. Let mantissa starts from 00000001, 00000011, \ *00000111,..., until 11111111.*/ \ - memset(tmp1, 0, SRC_SIZE); \ - memset(tmp2, 0, SRC_SIZE); \ + memset(tmp1, 0, SRC_SIZE); \ + memset(tmp2, 0, SRC_SIZE); \ H5T__bit_set(tmp2, SRC_PREC - 1, (size_t)1, TRUE); /*the negative value*/ \ for (n = 0; n < SRC_MANT_DIG - 1; n++) { \ H5T__bit_set(tmp1, n, (size_t)1, TRUE); /*turn on 1 bit each time*/ \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - memcpy(buf_p, tmp1, SRC_SIZE); \ - memcpy(saved_p, tmp1, SRC_SIZE); \ + memcpy(buf_p, tmp1, SRC_SIZE); \ + memcpy(saved_p, tmp1, SRC_SIZE); \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -315,14 +315,14 @@ static int without_hardware_g = 0; /*negative values*/ \ H5T__bit_set(tmp2, n, (size_t)1, TRUE); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ - memcpy(buf_p, tmp2, SRC_SIZE); \ - memcpy(saved_p, tmp2, SRC_SIZE); \ + memcpy(buf_p, tmp2, SRC_SIZE); \ + memcpy(saved_p, tmp2, SRC_SIZE); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ - free(tmp1); \ - free(tmp2); \ + free(tmp1); \ + free(tmp2); \ } /* Allocate buffer and initialize it with floating-point special values, +/-0, +/-infinity, @@ -341,24 +341,24 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - value = (unsigned char *)calloc(SRC_SIZE, sizeof(unsigned char)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + value = (unsigned char *)calloc(SRC_SIZE, sizeof(unsigned char)); \ \ buf_p = BUF; \ \ /* +0 */ \ H5T__bit_set(value, (size_t)0, SRC_PREC, FALSE); \ - memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ buf_p += SRC_SIZE; \ \ for (n = 0; n < 2; n++) { \ if (n == 1) { \ - memset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ + memset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ /* -0 */ \ H5T__bit_set(value, (size_t)(SRC_PREC - 1), (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ } \ @@ -366,27 +366,27 @@ static int without_hardware_g = 0; /* +/-infinity */ \ H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 1), SRC_PREC - SRC_MANT_DIG, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-SNaN */ \ H5T__bit_set(value, (size_t)0, (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-QNaN */ \ H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 2), (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ } \ \ - memcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - free(value); \ + memcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + free(value); \ } static hbool_t overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits); @@ -988,7 +988,7 @@ test_derived_flt(void) /* Print errors */ if (0 == fails_this_test++) { snprintf(str, sizeof(str), - "\nTesting random sw derived floating-point -> derived floating-point conversions"); + "\nTesting random sw derived floating-point -> derived floating-point conversions"); printf("%-70s", str); fflush(stdout); H5_FAILED(); @@ -1157,7 +1157,7 @@ test_derived_flt(void) /* Print errors */ if (0 == fails_this_test++) { snprintf(str, sizeof(str), - "\nTesting random sw derived floating-point -> derived floating-point conversions"); + "\nTesting random sw derived floating-point -> derived floating-point conversions"); printf("%-70s", str); fflush(stdout); H5_FAILED(); @@ -1474,8 +1474,7 @@ test_derived_integer(void) /* Print errors */ if (0 == fails_this_test++) { - snprintf(str, sizeof(str), - "\nTesting random sw derived integer -> derived integer conversions"); + snprintf(str, sizeof(str), "\nTesting random sw derived integer -> derived integer conversions"); printf("%-70s", str); fflush(stdout); H5_FAILED(); @@ -2930,17 +2929,16 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) puts("Sizeof(float)==sizeof(double) - some tests may not be sensible."); if (OTHER == src_type || OTHER == dst_type) { if (!strcmp(name, "noop")) - snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, - dst_type_name); + snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); else if (run_test == TEST_SPECIAL) snprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); else if (run_test == TEST_NORMAL) snprintf(str, sizeof(str), "Testing %s normalized %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); else if (run_test == TEST_DENORM) snprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); printf("%-70s", str); H5_FAILED(); @@ -2949,17 +2947,16 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } else { if (!strcmp(name, "noop")) - snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, - dst_type_name); + snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); else if (run_test == TEST_SPECIAL) snprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); else if (run_test == TEST_NORMAL) snprintf(str, sizeof(str), "Testing %s normalized %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); else if (run_test == TEST_DENORM) snprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); printf("%-70s", str); fflush(stdout); @@ -3614,13 +3611,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) else { if (run_test == TEST_NORMAL) snprintf(str, sizeof(str), "Testing %s normalized %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); else if (run_test == TEST_DENORM) snprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); else snprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, src_type_name, - dst_type_name); + dst_type_name); printf("%-70s", str); fflush(stdout); fails_this_test = 0; @@ -4894,7 +4891,7 @@ run_fp_tests(const char *name) char str[256]; /*string */ snprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, "long double", - "float"); + "float"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to the conversion problem on IBM ppc64le cpu."); @@ -4918,7 +4915,7 @@ run_fp_tests(const char *name) char str[256]; /*string */ snprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, "long double", - "float or double"); + "float or double"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to the conversion problem on IBM ppc64le cpu."); @@ -4998,8 +4995,7 @@ run_int_fp_conv(const char *name) { char str[256]; /*string */ - snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "(unsigned) long", - "long double"); + snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "(unsigned) long", "long double"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to the special algorithm of hardware conversion."); @@ -5026,7 +5022,7 @@ run_int_fp_conv(const char *name) char str[256]; /*hello string */ snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "unsigned long long", - "long double"); + "long double"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to compiler not handling conversion."); @@ -5120,7 +5116,7 @@ run_fp_int_conv(const char *name) char str[256]; /*string */ snprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, "long double", - "signed and unsigned char, short, int, long"); + "signed and unsigned char, short, int, long"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to the conversion problem on IBM ppc64le cpu."); @@ -5143,7 +5139,7 @@ run_fp_int_conv(const char *name) char str[256]; /*string */ snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", - "(unsigned) long"); + "(unsigned) long"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to the special algorithm of hardware conversion."); @@ -5171,7 +5167,7 @@ run_fp_int_conv(const char *name) char str[256]; /*string */ snprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", - "unsigned long long"); + "unsigned long long"); printf("%-70s", str); SKIPPED(); puts(" Test skipped due to hardware conversion error."); diff --git a/test/dtransform.c b/test/dtransform.c index 1a51cef..cab643b 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -81,7 +81,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, (((VAR1)[i][j] <= (TYPE)((VAR2)[i][j])) && \ (((VAR1)[i][j] + (TOL)) > (TYPE)((VAR2)[i][j]))))) { \ H5_FAILED(); \ - fprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ + fprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ goto error; \ } \ } \ @@ -97,7 +97,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, if (!(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + (TOL))) && \ ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - (TOL))))) { \ H5_FAILED(); \ - fprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ + fprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ goto error; \ } \ } \ @@ -112,7 +112,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, for (j = 0; j < COLS; j++) { \ if ((VAR1)[i][j] != (VAR2)[i][j]) { \ H5_FAILED(); \ - fprintf(stderr, " ERROR: data failed to match computed data\n"); \ + fprintf(stderr, " ERROR: data failed to match computed data\n"); \ goto error; \ } \ } \ @@ -292,7 +292,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, } \ else { \ H5_FAILED(); \ - fprintf(stderr, " ERROR: Data transform allowed invalid TRANSFORM transform to be set\n"); \ + fprintf(stderr, " ERROR: Data transform allowed invalid TRANSFORM transform to be set\n"); \ goto error; \ } \ } diff --git a/test/dtypes.c b/test/dtypes.c index 1adda74..d4553f8 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -70,8 +70,8 @@ FAIL_STACK_ERROR \ if ((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) { \ H5_FAILED(); \ - printf(" #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS), \ - (long long)H5I_nmembers(H5I_DATATYPE)); \ + printf(" #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS), \ + (long long)H5I_nmembers(H5I_DATATYPE)); \ goto error; \ } @@ -835,9 +835,9 @@ test_compound_2(void) H5_FAILED(); printf(" i=%d\n", i); printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], - s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); printf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], - d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); + d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); goto error; } } @@ -959,9 +959,9 @@ test_compound_3(void) H5_FAILED(); printf(" i=%d\n", i); printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], - s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); - printf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1], - d_ptr->c[2], d_ptr->c[3], d_ptr->e); + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + printf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], + d_ptr->c[3], d_ptr->e); goto error; } } @@ -1089,9 +1089,9 @@ test_compound_4(void) H5_FAILED(); printf(" i=%d\n", i); printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], - s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); printf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], - d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); + d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); goto error; } } @@ -2350,22 +2350,22 @@ test_compound_11(void) for (u = 0; u < NTESTELEM; u++) { if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR } /* end if */ if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR } /* end if */ if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ else if (strcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ } /* end for */ @@ -2401,22 +2401,22 @@ test_compound_11(void) for (u = 0; u < NTESTELEM; u++) { if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR } /* end if */ if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR } /* end if */ if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ else if (strcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ } /* end for */ @@ -2442,22 +2442,22 @@ test_compound_11(void) for (u = 0; u < NTESTELEM; u++) { if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR } /* end if */ if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR } /* end if */ if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ else if (strcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ } /* end for */ diff --git a/test/earray.c b/test/earray.c index e6e55e3..08c4eee 100644 --- a/test/earray.c +++ b/test/earray.c @@ -333,63 +333,61 @@ check_stats(const H5EA_t *ea, const earray_state_t *state) /* Compare information */ if (earray_stats.stored.max_idx_set != state->max_idx_set) { fprintf(stdout, - "earray_stats.stored.max_idx_set = %" PRIuHSIZE ", state->max_idx_set = %" PRIuHSIZE "\n", - earray_stats.stored.max_idx_set, state->max_idx_set); + "earray_stats.stored.max_idx_set = %" PRIuHSIZE ", state->max_idx_set = %" PRIuHSIZE "\n", + earray_stats.stored.max_idx_set, state->max_idx_set); TEST_ERROR } /* end if */ if (earray_stats.stored.nelmts != state->nelmts) { fprintf(stdout, "earray_stats.stored.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n", - earray_stats.stored.nelmts, state->nelmts); + earray_stats.stored.nelmts, state->nelmts); TEST_ERROR } /* end if */ if (earray_stats.computed.hdr_size != state->hdr_size) { - fprintf(stdout, - "earray_stats.computed.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", - earray_stats.computed.hdr_size, state->hdr_size); + fprintf(stdout, "earray_stats.computed.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", + earray_stats.computed.hdr_size, state->hdr_size); TEST_ERROR } /* end if */ if (earray_stats.computed.nindex_blks != state->nindex_blks) { fprintf(stdout, - "earray_stats.computed.nindex_blks = %" PRIuHSIZE ", state->nindex_blks = %" PRIuHSIZE "\n", - earray_stats.computed.nindex_blks, state->nindex_blks); + "earray_stats.computed.nindex_blks = %" PRIuHSIZE ", state->nindex_blks = %" PRIuHSIZE "\n", + earray_stats.computed.nindex_blks, state->nindex_blks); TEST_ERROR } /* end if */ if (earray_stats.computed.index_blk_size != state->index_blk_size) { fprintf(stdout, - "earray_stats.computed.index_blk_size = %" PRIuHSIZE ", state->index_blk_size = %" PRIuHSIZE - "\n", - earray_stats.computed.index_blk_size, state->index_blk_size); + "earray_stats.computed.index_blk_size = %" PRIuHSIZE ", state->index_blk_size = %" PRIuHSIZE + "\n", + earray_stats.computed.index_blk_size, state->index_blk_size); TEST_ERROR } /* end if */ if (earray_stats.stored.ndata_blks != state->ndata_blks) { fprintf(stdout, - "earray_stats.stored.ndata_blks = %" PRIuHSIZE ", state->ndata_blks = %" PRIuHSIZE "\n", - earray_stats.stored.ndata_blks, state->ndata_blks); + "earray_stats.stored.ndata_blks = %" PRIuHSIZE ", state->ndata_blks = %" PRIuHSIZE "\n", + earray_stats.stored.ndata_blks, state->ndata_blks); TEST_ERROR } /* end if */ /* Don't compare this currently, it's very hard to compute */ #ifdef NOT_YET if (earray_stats.stored.data_blk_size != state->data_blk_size) { fprintf(stdout, - "earray_stats.stored.data_blk_size = %" PRIuHSIZE ", state->data_blk_size = %" PRIuHSIZE - "\n", - earray_stats.stored.data_blk_size, state->data_blk_size); + "earray_stats.stored.data_blk_size = %" PRIuHSIZE ", state->data_blk_size = %" PRIuHSIZE "\n", + earray_stats.stored.data_blk_size, state->data_blk_size); TEST_ERROR } /* end if */ #endif /* NOT_YET */ if (earray_stats.stored.nsuper_blks != state->nsuper_blks) { fprintf(stdout, - "earray_stats.stored.nsuper_blks = %" PRIuHSIZE ", state->nsuper_blks = %" PRIuHSIZE "\n", - earray_stats.stored.nsuper_blks, state->nsuper_blks); + "earray_stats.stored.nsuper_blks = %" PRIuHSIZE ", state->nsuper_blks = %" PRIuHSIZE "\n", + earray_stats.stored.nsuper_blks, state->nsuper_blks); TEST_ERROR } /* end if */ /* Don't compare this currently, it's very hard to compute */ #ifdef NOT_YET if (earray_stats.stored.super_blk_size != state->super_blk_size) { fprintf(stdout, - "earray_stats.stored.super_blk_size = %" PRIuHSIZE ", state->super_blk_size = %" PRIuHSIZE - "\n", - earray_stats.stored.super_blk_size, state->super_blk_size); + "earray_stats.stored.super_blk_size = %" PRIuHSIZE ", state->super_blk_size = %" PRIuHSIZE + "\n", + earray_stats.stored.super_blk_size, state->super_blk_size); TEST_ERROR } /* end if */ #endif /* NOT_YET */ @@ -2543,16 +2541,15 @@ main(void) /* Test first element in data block */ nelmts = (hsize_t)((hsize_t)1 + cparam.idx_blk_elmts + tparam.sblk_info[sblk].start_idx + (tparam.sblk_info[sblk].dblk_nelmts * dblk)); - snprintf(test_str, sizeof(test_str), - "setting first element of array's data block #%llu", - (unsigned long long)ndblks); + snprintf(test_str, sizeof(test_str), "setting first element of array's data block #%llu", + (unsigned long long)ndblks); nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str); /* Test all elements in data block */ nelmts = (hsize_t)(cparam.idx_blk_elmts + tparam.sblk_info[sblk].start_idx + (tparam.sblk_info[sblk].dblk_nelmts * (dblk + 1))); snprintf(test_str, sizeof(test_str), "setting all elements of array's data block #%llu", - (unsigned long long)ndblks); + (unsigned long long)ndblks); nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str); /* Increment data block being tested */ diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c index 96ebfb1..fb600b5 100644 --- a/test/enc_dec_plist.c +++ b/test/enc_dec_plist.c @@ -200,7 +200,7 @@ main(void) low_string = h5_get_version_string(low); high_string = h5_get_version_string(high); snprintf(msg, sizeof(msg), - "Testing ENCODE/DECODE with file version bounds: (%s, %s):", low_string, high_string); + "Testing ENCODE/DECODE with file version bounds: (%s, %s):", low_string, high_string); puts(msg); if (VERBOSE_MED) diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c index ed631cb..88423ab 100644 --- a/test/enc_dec_plist_cross_platform.c +++ b/test/enc_dec_plist_cross_platform.c @@ -172,7 +172,7 @@ test_plists(const char *filename_prefix) for (config_2 = config_1 + 1; config_2 < NCONFIG; config_2++) { /* Generate filename for file 1 */ if (snprintf(filename, sizeof(filename), "%s%s%s", filename_prefix, - config_1 & CONFIG_64 ? "64" : "32", config_1 & CONFIG_LE ? "le" : "be") < 0) + config_1 & CONFIG_64 ? "64" : "32", config_1 & CONFIG_LE ? "le" : "be") < 0) TEST_ERROR /* Read file 1 */ @@ -188,7 +188,7 @@ test_plists(const char *filename_prefix) /* Generate filename for file 2 */ if (snprintf(filename, sizeof(filename), "%s%s%s", filename_prefix, - config_2 & CONFIG_64 ? "64" : "32", config_2 & CONFIG_LE ? "le" : "be") < 0) + config_2 & CONFIG_64 ? "64" : "32", config_2 & CONFIG_LE ? "le" : "be") < 0) TEST_ERROR /* Read file 1 */ diff --git a/test/enum.c b/test/enum.c index 021ef15..20dac17 100644 --- a/test/enum.c +++ b/test/enum.c @@ -196,7 +196,7 @@ test_conv(hid_t file) if (data1[i] != data2[i]) { H5_FAILED(); printf(" 1. data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data2[i])); + (int)(data1[i]), (unsigned long)i, (int)(data2[i])); goto error; } /* end if */ @@ -208,7 +208,7 @@ test_conv(hid_t file) if ((short)data1[i] != data_short[i]) { H5_FAILED(); printf(" 2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_short[i])); + (int)(data1[i]), (unsigned long)i, (int)(data_short[i])); goto error; } /* end if */ @@ -220,7 +220,7 @@ test_conv(hid_t file) if ((int)data1[i] != (int)data_double[i]) { H5_FAILED(); printf(" 3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); + (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); goto error; } /* end if */ @@ -246,7 +246,7 @@ test_conv(hid_t file) if ((int)data1[i] != data_int[i]) { H5_FAILED(); printf(" 4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_int[i])); + (int)(data1[i]), (unsigned long)i, (int)(data_int[i])); goto error; } /* end if */ @@ -272,7 +272,7 @@ test_conv(hid_t file) if ((int)data1[i] != (int)data_double[i]) { H5_FAILED(); printf(" 5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); + (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); goto error; } /* end if */ @@ -376,7 +376,7 @@ test_tr1(hid_t file) if (data1[i] != data2[i]) { H5_FAILED(); printf(" data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, (int)(data1[i]), - (unsigned long)i, (int)(data2[i])); + (unsigned long)i, (int)(data2[i])); goto error; } @@ -480,7 +480,7 @@ test_tr2(hid_t file) if (data1[i] != data2[i]) { H5_FAILED(); printf(" data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, (int)(data1[i]), - (unsigned long)i, (int)(data2[i])); + (unsigned long)i, (int)(data2[i])); goto error; } diff --git a/test/err_compat.c b/test/err_compat.c index a340d22..377c45c 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -127,7 +127,7 @@ custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data) TEST_ERROR; fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, - err_desc->func_name, err_desc->line); + err_desc->func_name, err_desc->line); fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); fprintf(stream, "%*sminor: %s\n", indent * 2, "", min); @@ -174,7 +174,7 @@ custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data) TEST_ERROR; fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, - err_desc->func_name, err_desc->line); + err_desc->func_name, err_desc->line); fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); fprintf(stream, "%*sminor: %s\n", indent * 2, "", min); @@ -466,7 +466,7 @@ main(void) int i; fprintf(stderr, " This program tests the Error API compatible with HDF5 v1.6. There are supposed to " - "be some error messages\n"); + "be some error messages\n"); fapl_id = h5_fileaccess(); /* Set up data arrays */ diff --git a/test/error_test.c b/test/error_test.c index 8c78311..24f115b 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -436,7 +436,7 @@ custom_print_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) TEST_ERROR; fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, - err_desc->func_name, err_desc->line); + err_desc->func_name, err_desc->line); fprintf(stream, "%*sclass: %s\n", indent * 2, "", cls); fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); fprintf(stream, "%*sminor: %s\n", indent * 2, "", min); diff --git a/test/extend.c b/test/extend.c index 627f4b4..aa30607 100644 --- a/test/extend.c +++ b/test/extend.c @@ -119,7 +119,7 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me printf(" i=%d, j=%d, k=%d, m=%d\n", i, j, k, m); printf(" buf2[%d][%d]=%d\n", k, m, buf2[k][m]); printf(" buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m, - buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); + buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); TEST_ERROR; } /* end if */ } /* end for */ @@ -222,7 +222,7 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h printf(" i=%d, j=%d, k=%d, m=%d\n", i, j, k, m); printf(" buf2[%d][%d]=%d\n", k, m, buf2[k][m]); printf(" buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m, - buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); + buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); TEST_ERROR; } /* end if */ } /* end for */ diff --git a/test/external.c b/test/external.c index 10ede82..fb30162 100644 --- a/test/external.c +++ b/test/external.c @@ -167,7 +167,7 @@ test_non_extendible(hid_t file) H5_FAILED(); puts(" Wrong file size."); printf(" got: %lu\n ans: %lu\n", (unsigned long)file_size, - (unsigned long)max_size[0] * sizeof(int)); + (unsigned long)max_size[0] * sizeof(int)); goto error; } diff --git a/test/farray.c b/test/farray.c index 1d4edde..2cd9a2c 100644 --- a/test/farray.c +++ b/test/farray.c @@ -179,19 +179,19 @@ check_stats(const H5FA_t *fa, const farray_state_t *state) /* Compare information */ if (farray_stats.hdr_size != state->hdr_size) { fprintf(stdout, "farray_stats.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", - farray_stats.hdr_size, state->hdr_size); + farray_stats.hdr_size, state->hdr_size); TEST_ERROR } if (farray_stats.dblk_size != state->dblk_size) { fprintf(stdout, "farray_stats.dblk_size = %" PRIuHSIZE ", state->dblk_size = %" PRIuHSIZE "\n", - farray_stats.dblk_size, state->dblk_size); + farray_stats.dblk_size, state->dblk_size); TEST_ERROR } if (farray_stats.nelmts != state->nelmts) { fprintf(stdout, "farray_stats.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n", - farray_stats.nelmts, state->nelmts); + farray_stats.nelmts, state->nelmts); TEST_ERROR } diff --git a/test/fheap.c b/test/fheap.c index 193a105..bf2bac2 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -273,44 +273,44 @@ check_stats(const H5HF_t *fh, const fheap_heap_state_t *state) FAIL_STACK_ERROR if (heap_stats.man_nobjs != state->man_nobjs) { fprintf(stdout, "heap_stats.man_nobjs = %" PRIuHSIZE ", state->man_nobjs = %zu\n", - heap_stats.man_nobjs, state->man_nobjs); + heap_stats.man_nobjs, state->man_nobjs); TEST_ERROR } /* end if */ if (heap_stats.man_size != state->man_size) { fprintf(stdout, "heap_stats.man_size = %" PRIuHSIZE ", state->man_size = %" PRIuHSIZE "\n", - heap_stats.man_size, state->man_size); + heap_stats.man_size, state->man_size); TEST_ERROR } /* end if */ if (heap_stats.man_alloc_size != state->man_alloc_size) { fprintf(stdout, - "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n", - heap_stats.man_alloc_size, state->man_alloc_size); + "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n", + heap_stats.man_alloc_size, state->man_alloc_size); TEST_ERROR } /* end if */ if (heap_stats.man_free_space != state->man_free_space) { fprintf(stdout, - "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n", - heap_stats.man_free_space, state->man_free_space); + "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n", + heap_stats.man_free_space, state->man_free_space); TEST_ERROR } /* end if */ if (heap_stats.huge_nobjs != state->huge_nobjs) { fprintf(stdout, "heap_stats.huge_nobjs = %" PRIuHSIZE ", state->huge_nobjs = %zu\n", - heap_stats.huge_nobjs, state->huge_nobjs); + heap_stats.huge_nobjs, state->huge_nobjs); TEST_ERROR } /* end if */ if (heap_stats.huge_size != state->huge_size) { fprintf(stdout, "heap_stats.huge_size = %" PRIuHSIZE ", state->huge_size = %" PRIuHSIZE "\n", - heap_stats.huge_size, state->huge_size); + heap_stats.huge_size, state->huge_size); TEST_ERROR } /* end if */ if (heap_stats.tiny_nobjs != state->tiny_nobjs) { fprintf(stdout, "heap_stats.tiny_nobjs = %" PRIuHSIZE ", state->tiny_nobjs = %zu\n", - heap_stats.tiny_nobjs, state->tiny_nobjs); + heap_stats.tiny_nobjs, state->tiny_nobjs); TEST_ERROR } /* end if */ if (heap_stats.tiny_size != state->tiny_size) { fprintf(stdout, "heap_stats.tiny_size = %" PRIuHSIZE ", state->tiny_size = %" PRIuHSIZE "\n", - heap_stats.tiny_size, state->tiny_size); + heap_stats.tiny_size, state->tiny_size); TEST_ERROR } /* end if */ @@ -16746,7 +16746,7 @@ main(void) case 2: small_cparam.id_len = 37; puts("Using 'direct' heap ID format for 'huge' objects and larger IDs for " - "'tiny' objects"); + "'tiny' objects"); tparam.actual_id_len = 37; break; diff --git a/test/fillval.c b/test/fillval.c index 89b1017..cd66790 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -726,8 +726,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) rd_c.z != '\0') { H5_FAILED(); puts(" Got wrong fill value"); - printf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, - rd_c.x, rd_c.z); + printf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x, + rd_c.z); } if (H5Dclose(dset9) < 0) goto error; @@ -821,7 +821,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) H5_FAILED(); puts(" Got wrong fill value"); printf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x, - rd_c.z); + rd_c.z); } if (H5Dclose(dset8) < 0) goto error; @@ -935,11 +935,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); fprintf(stdout, - " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE - "}, read: %u, " - "Fill value: %u\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], val_rd, - fillval); + " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE + "}, read: %u, " + "Fill value: %u\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], val_rd, + fillval); goto error; } /* case for compound datatype */ @@ -953,12 +953,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); fprintf(stdout, - " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE - "}, read: %f, %d, %f, %c" - "Fill value: %f, %d, %f, %c\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], - (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)fill_c.a, fill_c.x, fill_c.y, - fill_c.z); + " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE + "}, read: %f, %d, %f, %c" + "Fill value: %f, %d, %f, %c\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], (double)rd_c.a, + rd_c.x, rd_c.y, rd_c.z, (double)fill_c.a, fill_c.x, fill_c.y, fill_c.z); goto error; } } @@ -996,11 +995,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); fprintf(stdout, - " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - ", %" PRIuHSIZE "}, read: %u, " - "Fill value: %u\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], buf[u], - fillval); + " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + ", %" PRIuHSIZE "}, read: %u, " + "Fill value: %u\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], buf[u], + fillval); goto error; } /* end if */ } /* end for */ @@ -1023,12 +1022,12 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); fprintf(stdout, - " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - ", %" PRIuHSIZE "}, read: %f, %d, %f, %c" - "Fill value: %f, %d, %f, %c\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], - (double)buf_c[u].a, buf_c[u].x, buf_c[u].y, buf_c[u].z, (double)fill_c.a, - fill_c.x, fill_c.y, fill_c.z); + " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + ", %" PRIuHSIZE "}, read: %f, %d, %f, %c" + "Fill value: %f, %d, %f, %c\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], + (double)buf_c[u].a, buf_c[u].x, buf_c[u].y, buf_c[u].z, (double)fill_c.a, + fill_c.x, fill_c.y, fill_c.z); goto error; } /* end if */ } /* end for */ @@ -1093,9 +1092,9 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, " - "should be: %u\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], val_rd, should_be); + "should be: %u\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], val_rd, should_be); goto error; } } @@ -1105,9 +1104,9 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, " - "should be: %u\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], val_rd, should_be); + "should be: %u\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], val_rd, should_be); goto error; } } @@ -1137,10 +1136,10 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c " - "should be: %f,%d,%f,%c\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, - (double)should_be_c.a, should_be_c.x, should_be_c.y, should_be_c.z); + "should be: %f,%d,%f,%c\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a, + should_be_c.x, should_be_c.y, should_be_c.z); goto error; } } /* end for fill_time == H5D_FILL_TIME_ALLOC */ @@ -1154,10 +1153,10 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f H5_FAILED(); fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c " - "should be: %f,%d,%f,%c\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, - (double)should_be_c.a, should_be_c.x, should_be_c.y, should_be_c.z); + "should be: %f,%d,%f,%c\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a, + should_be_c.x, should_be_c.y, should_be_c.z); goto error; } } /* end for fill_time == H5D_FILL_TIME_NEVER */ @@ -1449,10 +1448,10 @@ test_extend_verify_integer(unsigned lineno, const hsize_t *offset, const void *_ if (*test_val != *compare_val) { fprintf(stdout, "%u: Value read was not expected.\n", lineno); fprintf(stdout, - " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - "}, read: %d, " - "expected: %d\n", - offset[0], offset[1], offset[2], offset[3], offset[4], *test_val, *compare_val); + " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + "}, read: %d, " + "expected: %d\n", + offset[0], offset[1], offset[2], offset[3], offset[4], *test_val, *compare_val); goto error; } /* end if */ @@ -1541,11 +1540,11 @@ test_extend_verify_cmpd_vl(unsigned lineno, const hsize_t *offset, const void *_ strcmp(test_val->b, compare_val->b) != 0 || (test_val->y != compare_val->y)) { fprintf(stdout, "%u: Value read was not expected.\n", lineno); fprintf(stdout, - " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - "}, read: {%d, '%s', '%s', %d} " - "expected: {%d, '%s', '%s', %d}\n", - offset[0], offset[1], offset[2], offset[3], offset[4], test_val->x, test_val->a, - test_val->b, test_val->y, compare_val->x, compare_val->a, compare_val->b, compare_val->y); + " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + "}, read: {%d, '%s', '%s', %d} " + "expected: {%d, '%s', '%s', %d}\n", + offset[0], offset[1], offset[2], offset[3], offset[4], test_val->x, test_val->a, test_val->b, + test_val->y, compare_val->x, compare_val->a, compare_val->b, compare_val->y); goto error; } /* end if */ @@ -2244,8 +2243,8 @@ test_compatible(void) if ((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { printf(" Could not open file %s. Try set $srcdir to point at the " - "source directory of test\n", - testfile); + "source directory of test\n", + testfile); goto error; } @@ -2458,8 +2457,8 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t H5_FAILED(); fprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__); printf(" {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)r_values[0], - (long)r_values[1], (long)r_values[2], (long)r_values[3], (long)w_values[0], - (long)fillval, (long)fillval, (long)fillval); + (long)r_values[1], (long)r_values[2], (long)r_values[3], (long)w_values[0], (long)fillval, + (long)fillval, (long)fillval); goto error; } /* check unallocated chunk */ @@ -2468,8 +2467,8 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t H5_FAILED(); fprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__); printf(" {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)f_values[0], - (long)f_values[1], (long)f_values[2], (long)f_values[3], (long)fillval, (long)fillval, - (long)fillval, (long)fillval); + (long)f_values[1], (long)f_values[2], (long)f_values[3], (long)fillval, (long)fillval, + (long)fillval, (long)fillval); goto error; } /* for the "never fill" case expect to get trash values, so skip */ diff --git a/test/flushrefresh.c b/test/flushrefresh.c index 9b5e81c..beb2e73 100644 --- a/test/flushrefresh.c +++ b/test/flushrefresh.c @@ -71,21 +71,21 @@ FILE *errorfile; #define ERRFILE "flushrefresh_ERROR" #define PROCESS_ERROR \ { \ - errorfile = fopen(ERRFILE, "w+"); \ - fprintf(errorfile, "Error occurred in flushrefresh.\n"); \ - fflush(errorfile); \ - fclose(errorfile); \ + errorfile = fopen(ERRFILE, "w+"); \ + fprintf(errorfile, "Error occurred in flushrefresh.\n"); \ + fflush(errorfile); \ + fclose(errorfile); \ TEST_ERROR; \ } #define CLEANUP_FILES \ { \ - remove(ERRFILE); \ - remove(FILENAME); \ - remove(SIGNAL_TO_SCRIPT); \ - remove(SIGNAL_BETWEEN_PROCESSES_1); \ - remove(SIGNAL_BETWEEN_PROCESSES_2); \ - remove(SIGNAL_FROM_SCRIPT); \ + remove(ERRFILE); \ + remove(FILENAME); \ + remove(SIGNAL_TO_SCRIPT); \ + remove(SIGNAL_BETWEEN_PROCESSES_1); \ + remove(SIGNAL_BETWEEN_PROCESSES_2); \ + remove(SIGNAL_FROM_SCRIPT); \ } /* ===================== */ @@ -162,8 +162,7 @@ main(int argc, char *argv[]) TEST_ERROR; } /* end if */ else { - fprintf(stdout, - "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n"); + fprintf(stdout, "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n"); /* Test script is expecting some signals, so send them out to end it. */ if (end_verification() < 0) @@ -1097,13 +1096,12 @@ flush_verification(const char *obj_pathname, const char *expected) else if (strcmp(expected, NOT_FLUSHED) == 0) { if ((oid > 0) || (status > 0)) { fprintf(stderr, "Error! %s not expected to be flushed, but it was found on disk!\n", - obj_pathname); + obj_pathname); PROCESS_ERROR; } /* end if */ } else { - fprintf(stderr, "Error! Bad verification parameters. %s is an invalid expected outcome.\n", - expected); + fprintf(stderr, "Error! Bad verification parameters. %s is an invalid expected outcome.\n", expected); PROCESS_ERROR; } /* end if */ @@ -1345,11 +1343,11 @@ refresh_verification(const char *obj_pathname) if (!ok) { printf("FLUSHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)flushed_oinfo.num_attrs, - (int)flushed_ninfo.hdr.nmesgs, (int)flushed_ninfo.hdr.nchunks, - (int)flushed_ninfo.hdr.space.total); + (int)flushed_ninfo.hdr.nmesgs, (int)flushed_ninfo.hdr.nchunks, + (int)flushed_ninfo.hdr.space.total); printf("REFRESHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)refreshed_oinfo.num_attrs, - (int)refreshed_ninfo.hdr.nmesgs, (int)refreshed_ninfo.hdr.nchunks, - (int)refreshed_ninfo.hdr.space.total); + (int)refreshed_ninfo.hdr.nmesgs, (int)refreshed_ninfo.hdr.nchunks, + (int)refreshed_ninfo.hdr.space.total); PROCESS_ERROR; } diff --git a/test/freespace.c b/test/freespace.c index 1e36daf..c51f301 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -245,12 +245,12 @@ TEST_sect_merging(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, voi /* Check arguments. */ assert(sect1); assert(((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE) || - ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || - ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); + ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || + ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); assert(sect2); assert((sect2->sect_info.type == TEST_FSPACE_SECT_TYPE) || - (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || - (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); + (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || + (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); assert(H5F_addr_eq((*sect1)->sect_info.addr + (*sect1)->sect_info.size, sect2->sect_info.addr)); /* Add second section's size to first section */ @@ -401,27 +401,26 @@ check_stats(const H5F_t *f, const H5FS_t *frsp, frspace_state_t *state) if (frspace_stats.tot_space != state->tot_space) { fprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n", - frspace_stats.tot_space, state->tot_space); + frspace_stats.tot_space, state->tot_space); TEST_ERROR } /* end if */ if (frspace_stats.tot_sect_count != state->tot_sect_count) { fprintf(stdout, - "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", - frspace_stats.tot_sect_count, state->tot_sect_count); + "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", + frspace_stats.tot_sect_count, state->tot_sect_count); TEST_ERROR } /* end if */ if (frspace_stats.serial_sect_count != state->serial_sect_count) { fprintf(stdout, - "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.serial_sect_count, state->serial_sect_count); + "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE + "\n", + frspace_stats.serial_sect_count, state->serial_sect_count); TEST_ERROR } /* end if */ if (frspace_stats.ghost_sect_count != state->ghost_sect_count) { fprintf(stdout, - "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.ghost_sect_count, state->ghost_sect_count); + "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE "\n", + frspace_stats.ghost_sect_count, state->ghost_sect_count); TEST_ERROR } /* end if */ diff --git a/test/gen_plist.c b/test/gen_plist.c index cc79d77..332ba99 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -452,7 +452,7 @@ encode_plist(hid_t plist_id, int little_endian, int word_length, const char *fil /* Generate filename */ if ((ret = snprintf(filename, sizeof(filename), "%s%d%s", filename_prefix, word_length, - little_endian ? "le" : "be")) < 0) + little_endian ? "le" : "be")) < 0) assert(ret > 0); /* first call to encode returns only the size of the buffer needed */ diff --git a/test/genall5.c b/test/genall5.c index 348e523..a3ee58a 100644 --- a/test/genall5.c +++ b/test/genall5.c @@ -1830,7 +1830,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) } assert(ret >= 0); assert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || - (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); + (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); } if (pass) { @@ -2174,7 +2174,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) } assert(ret >= 0); assert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || - (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); + (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); } if (pass) { @@ -2896,7 +2896,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) } assert(ret >= 0); assert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || - (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); + (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); } if (pass) { diff --git a/test/gheap.c b/test/gheap.c index a5874e3..ebe7d15 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -42,9 +42,9 @@ nerrors++; \ if (nerrors <= GHEAP_REPEATED_ERR_LIM) { \ H5_FAILED(); \ - puts(MSG); \ + puts(MSG); \ if (nerrors == GHEAP_REPEATED_ERR_LIM) \ - puts(" Suppressing further errors..."); \ + puts(" Suppressing further errors..."); \ } /* end if */ \ } /* end GHEAP_REPEATED_ERR */ diff --git a/test/h5test.c b/test/h5test.c index 20cce29..00cefe3 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -626,12 +626,12 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu if (mpi_rank == 0) printf("*** Hint ***\n" - "You can use environment variable HDF5_PARAPREFIX to " - "run parallel test files in a\n" - "different directory or to add file type prefix. e.g.,\n" - " HDF5_PARAPREFIX=pfs:/PFS/user/me\n" - " export HDF5_PARAPREFIX\n" - "*** End of Hint ***\n"); + "You can use environment variable HDF5_PARAPREFIX to " + "run parallel test files in a\n" + "different directory or to add file type prefix. e.g.,\n" + " HDF5_PARAPREFIX=pfs:/PFS/user/me\n" + " export HDF5_PARAPREFIX\n" + "*** End of Hint ***\n"); explained = TRUE; #ifdef HDF5_PARAPREFIX @@ -1955,7 +1955,7 @@ h5_compare_file_bytes(char *f1name, char *f2name) if (f1size != f2size) { fprintf(stderr, "Files differ in size, %" PRIuHSIZE " vs. %" PRIuHSIZE "\n", (hsize_t)f1size, - (hsize_t)f2size); + (hsize_t)f2size); ret_value = -1; goto done; } diff --git a/test/h5test.h b/test/h5test.h index 04a4eb5..6fb2481 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -102,37 +102,37 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */ */ #define TESTING(WHAT) \ { \ - printf("Testing %-62s", WHAT); \ - fflush(stdout); \ + printf("Testing %-62s", WHAT); \ + fflush(stdout); \ } #define TESTING_2(WHAT) \ { \ - printf(" Testing %-60s", WHAT); \ - fflush(stdout); \ + printf(" Testing %-60s", WHAT); \ + fflush(stdout); \ } #define PASSED() \ do { \ - puts(" PASSED"); \ - fflush(stdout); \ + puts(" PASSED"); \ + fflush(stdout); \ } while (0) #define H5_FAILED() \ { \ - puts("*FAILED*"); \ - fflush(stdout); \ + puts("*FAILED*"); \ + fflush(stdout); \ } #define H5_WARNING() \ { \ - puts("*WARNING*"); \ - fflush(stdout); \ + puts("*WARNING*"); \ + fflush(stdout); \ } #define SKIPPED() \ { \ - puts(" -SKIP-"); \ - fflush(stdout); \ + puts(" -SKIP-"); \ + fflush(stdout); \ } #define PUTS_ERROR(s) \ { \ - puts(s); \ + puts(s); \ AT(); \ goto error; \ } @@ -158,7 +158,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */ { \ H5_FAILED(); \ AT(); \ - puts(s); \ + puts(s); \ goto error; \ } diff --git a/test/hdfs.c b/test/hdfs.c index d4b581f..41a3154 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -102,7 +102,7 @@ */ #define JSFAILED_AT() \ { \ - printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -193,10 +193,10 @@ { \ JSFAILED_AT() \ if (reason != NULL) { \ - printf("%s\n", (reason)); \ + printf("%s\n", (reason)); \ } \ else { \ - printf(" ! Expected %ld\n ! Actual %ld\n", (long)(expected), (long)(actual)); \ + printf(" ! Expected %ld\n ! Actual %ld\n", (long)(expected), (long)(actual)); \ } \ } @@ -233,10 +233,10 @@ const char *_reason = reason; \ JSFAILED_AT() \ if (_reason != NULL) { \ - printf("%s\n", _reason); \ + printf("%s\n", _reason); \ } \ else { \ - printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual)); \ + printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual)); \ } \ } @@ -303,7 +303,7 @@ *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(expected, actual, reason) \ - if (strcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -348,7 +348,7 @@ *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(actual, expected, reason) \ - if (strcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -870,8 +870,8 @@ test_vfd_open(void) if (NULL != fd) { if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) { fprintf(stderr, "\n!!!!! WARNING !!!!!\n" - " Successful open of file on local system " - "with non-HDFS VFD.\n"); + " Successful open of file on local system " + "with non-HDFS VFD.\n"); JSVERIFY(SUCCEED, H5FDclose(fd), "unable to close errant open"); fd = NULL; } @@ -1663,7 +1663,7 @@ main(void) } else { strncpy(/* TODO: error-check? */ - default_fa.namenode_name, hdfs_namenode_name_env, HDFS_NAMENODE_NAME_MAX_SIZE); + default_fa.namenode_name, hdfs_namenode_name_env, HDFS_NAMENODE_NAME_MAX_SIZE); } #endif /* H5_HAVE_LIBHDFS */ diff --git a/test/hyperslab.c b/test/hyperslab.c index 83eaf42..96ce0ba 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -238,11 +238,11 @@ test_fill(size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size AT(); printf(" acc != ref_value\n"); printf(" i=%lu, j=%lu, k=%lu, " - "dx=%lu, dy=%lu, dz=%lu, " - "fill=%d\n", - (unsigned long)i, (unsigned long)j, (unsigned long)k, - (unsigned long)dx, (unsigned long)dy, (unsigned long)dz, - fill_value); + "dx=%lu, dy=%lu, dz=%lu, " + "fill=%d\n", + (unsigned long)i, (unsigned long)j, (unsigned long)k, + (unsigned long)dx, (unsigned long)dy, (unsigned long)dz, + fill_value); print_ref(nx, ny, nz); printf("\n Result is:\n"); print_array(dst, nx, ny, nz); @@ -472,9 +472,9 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_ AT(); printf(" acc != ref_value\n"); printf(" i=%lu, j=%lu, k=%lu, " - "dx=%lu, dy=%lu, dz=%lu\n", - (unsigned long)i, (unsigned long)j, (unsigned long)k, - (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); + "dx=%lu, dy=%lu, dz=%lu\n", + (unsigned long)i, (unsigned long)j, (unsigned long)k, + (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); print_ref(nx, ny, nz); printf("\n Destination array is:\n"); print_array(dst, nx, ny, nz); @@ -508,11 +508,11 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_ */ AT(); printf(" acc != ref_value + nx*ny*nz - " - "dx*dy*dz\n"); + "dx*dy*dz\n"); printf(" i=%lu, j=%lu, k=%lu, " - "dx=%lu, dy=%lu, dz=%lu\n", - (unsigned long)i, (unsigned long)j, (unsigned long)k, - (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); + "dx=%lu, dy=%lu, dz=%lu\n", + (unsigned long)i, (unsigned long)j, (unsigned long)k, + (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); print_ref(nx, ny, nz); printf("\n Destination array is:\n"); print_array(dst, nx, ny, nz); @@ -635,7 +635,7 @@ test_multifill(size_t nx) for (j = 0; j < sizeof(fill); j++) printf(" %02x", ((uint8_t *)&fill)[j]); printf("\n dst[%lu]={%d,%g,%d}\n ", (unsigned long)i, dst[i].left, dst[i].mid, - dst[i].right); + dst[i].right); for (j = 0; j < sizeof(dst[i]); j++) printf(" %02x", ((uint8_t *)(dst + i))[j]); printf("\n"); @@ -870,7 +870,7 @@ test_sub_super(size_t nx, size_t ny) char s[256]; sprintf(s, "Testing image sampling %4lux%-4lu to %4lux%-4lu ", (unsigned long)(2 * nx), - (unsigned long)(2 * ny), (unsigned long)nx, (unsigned long)ny); + (unsigned long)(2 * ny), (unsigned long)nx, (unsigned long)ny); printf("%-70s", s); fflush(stdout); @@ -903,7 +903,7 @@ test_sub_super(size_t nx, size_t ny) if (!isatty(1)) { AT(); printf(" full[%lu][%lu] != half[%lu][%lu]\n", (unsigned long)i * 2, - (unsigned long)j * 2, (unsigned long)i, (unsigned long)j); + (unsigned long)j * 2, (unsigned long)i, (unsigned long)j); printf(" full is:\n"); print_array(full, 2 * nx, 2 * ny, (size_t)1); printf("\n half is:\n"); @@ -920,7 +920,7 @@ test_sub_super(size_t nx, size_t ny) * dimension. */ sprintf(s, "Testing image sampling %4lux%-4lu to %4lux%-4lu ", (unsigned long)nx, (unsigned long)ny, - (unsigned long)(2 * nx), (unsigned long)(2 * ny)); + (unsigned long)(2 * nx), (unsigned long)(2 * ny)); printf("%-70s", s); fflush(stdout); @@ -947,16 +947,16 @@ test_sub_super(size_t nx, size_t ny) for (j = 0; j < ny; j++) { if (half[i * ny + j] != twice[4 * i * ny + 2 * j]) sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]", (unsigned long)i, (unsigned long)j, - (unsigned long)i * 2, (unsigned long)j * 2); + (unsigned long)i * 2, (unsigned long)j * 2); else if (half[i * ny + j] != twice[4 * i * ny + 2 * j + 1]) sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]", (unsigned long)i, (unsigned long)j, - (unsigned long)i * 2, (unsigned long)j * 2 + 1); + (unsigned long)i * 2, (unsigned long)j * 2 + 1); else if (half[i * ny + j] != twice[(2 * i + 1) * 2 * ny + 2 * j]) sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]", (unsigned long)i, (unsigned long)j, - (unsigned long)i * 2 + 1, (unsigned long)j * 2); + (unsigned long)i * 2 + 1, (unsigned long)j * 2); else if (half[i * ny + j] != twice[(2 * i + 1) * 2 * ny + 2 * j + 1]) sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]", (unsigned long)i, (unsigned long)j, - (unsigned long)i * 2 + 1, (unsigned long)j * 2 + 1); + (unsigned long)i * 2 + 1, (unsigned long)j * 2 + 1); if (s[0]) { H5_FAILED() if (!isatty(1)) { @@ -1078,8 +1078,7 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z) hsize_t new_coords[ARRAY_OFFSET_NDIMS]; /* X, Y & X coordinates of offset */ char s[256]; - sprintf(s, "array offset %4lux%4lux%4lu elements", (unsigned long)z, (unsigned long)y, - (unsigned long)x); + sprintf(s, "array offset %4lux%4lux%4lu elements", (unsigned long)z, (unsigned long)y, (unsigned long)x); TESTING(s); /* Initialize */ @@ -1117,8 +1116,8 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z) /* Check computed coordinates */ for (v = 0; v < ARRAY_OFFSET_NDIMS; v++) if (coords[v] != new_coords[v]) { - fprintf(stderr, "coords[%zu]=%" PRIuHSIZE ", new_coords[%zu]=%" PRIuHSIZE "\n", v, - coords[v], v, new_coords[v]); + fprintf(stderr, "coords[%zu]=%" PRIuHSIZE ", new_coords[%zu]=%" PRIuHSIZE "\n", v, coords[v], + v, new_coords[v]); TEST_ERROR; } /* end if */ } /* end for */ diff --git a/test/links.c b/test/links.c index b2e6ab3..382d932 100644 --- a/test/links.c +++ b/test/links.c @@ -5823,7 +5823,7 @@ delete_by_idx_deprec(hid_t fapl) snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); else snprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 2))); + ((max_compact * 2) - ((u * 2) + 2))); if (strcmp(objname, tmpname) != 0) TEST_ERROR } /* end for */ @@ -5857,7 +5857,7 @@ delete_by_idx_deprec(hid_t fapl) snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); else snprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 4))); + ((max_compact * 2) - ((u * 2) + 4))); if (strcmp(objname, tmpname) != 0) TEST_ERROR } /* end for */ @@ -6714,7 +6714,7 @@ link_iterate_old_deprec_cb(hid_t group_id, const char *link_name, const H5L_info /* Verify name of link */ snprintf(objname, sizeof(objname), "filler %02u", - (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); + (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); if (strcmp(link_name, objname) != 0) return H5_ITER_ERROR; @@ -10221,8 +10221,7 @@ external_link_win2(hid_t fapl, hbool_t new_format) TEST_ERROR /* set up name for target link: "/CWD/tmp_links/extlinks11" */ - strcpy(tmpname, - &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */ + strcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */ strcat(tmpname, "/"); strcat(tmpname, FILENAME[31]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); @@ -18867,7 +18866,7 @@ delete_by_idx(hid_t fapl) snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); else snprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 2))); + ((max_compact * 2) - ((u * 2) + 2))); if (strcmp(objname, tmpname) != 0) TEST_ERROR } /* end for */ @@ -18901,7 +18900,7 @@ delete_by_idx(hid_t fapl) snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); else snprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 4))); + ((max_compact * 2) - ((u * 2) + 4))); if (strcmp(objname, tmpname) != 0) TEST_ERROR } /* end for */ @@ -19800,7 +19799,7 @@ link_iterate_old_cb(hid_t group_id, const char *link_name, const H5L_info2_t *in /* Verify name of link */ snprintf(objname, sizeof(objname), "filler %02u", - (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); + (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); if (strcmp(link_name, objname) != 0) return H5_ITER_ERROR; diff --git a/test/links_env.c b/test/links_env.c index 6db5764..8c0685f 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -186,7 +186,7 @@ main(void) /* Results */ if (nerrors) { printf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n", nerrors, - 1 == nerrors ? "" : "s"); + 1 == nerrors ? "" : "s"); exit(EXIT_FAILURE); } printf("All external Link (HDF5_EXT_PREFIX) tests passed.\n"); @@ -169,27 +169,26 @@ check_stats(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *state) if (frspace_stats.tot_space != state->tot_space) { fprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n", - frspace_stats.tot_space, state->tot_space); + frspace_stats.tot_space, state->tot_space); TEST_ERROR } /* end if */ if (frspace_stats.tot_sect_count != state->tot_sect_count) { fprintf(stdout, - "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", - frspace_stats.tot_sect_count, state->tot_sect_count); + "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", + frspace_stats.tot_sect_count, state->tot_sect_count); TEST_ERROR } /* end if */ if (frspace_stats.serial_sect_count != state->serial_sect_count) { fprintf(stdout, - "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.serial_sect_count, state->serial_sect_count); + "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE + "\n", + frspace_stats.serial_sect_count, state->serial_sect_count); TEST_ERROR } /* end if */ if (frspace_stats.ghost_sect_count != state->ghost_sect_count) { fprintf(stdout, - "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.ghost_sect_count, state->ghost_sect_count); + "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE "\n", + frspace_stats.ghost_sect_count, state->ghost_sect_count); TEST_ERROR } /* end if */ @@ -6573,11 +6572,11 @@ error: #define MULTI_SETUP(memb_map, memb_fapl, memb_name, memb_addr, sv) \ { \ H5FD_mem_t mt; \ - memset(memb_map, 0, sizeof memb_map); \ - memset(memb_fapl, 0, sizeof memb_fapl); \ - memset(memb_name, 0, sizeof memb_name); \ - memset(memb_addr, 0, sizeof memb_addr); \ - memset(sv, 0, sizeof sv); \ + memset(memb_map, 0, sizeof memb_map); \ + memset(memb_fapl, 0, sizeof memb_fapl); \ + memset(memb_name, 0, sizeof memb_name); \ + memset(memb_addr, 0, sizeof memb_addr); \ + memset(sv, 0, sizeof sv); \ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { \ memb_map[mt] = H5FD_MEM_SUPER; \ memb_fapl[mt] = H5P_DEFAULT; \ @@ -6586,22 +6585,22 @@ error: memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW; \ memb_map[H5FD_MEM_GHEAP] = H5FD_MEM_GHEAP; \ memb_map[H5FD_MEM_LHEAP] = H5FD_MEM_LHEAP; \ - sprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's'); \ + sprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's'); \ memb_name[H5FD_MEM_SUPER] = sv[H5FD_MEM_SUPER]; \ memb_addr[H5FD_MEM_SUPER] = 0; \ - sprintf(sv[H5FD_MEM_BTREE], "%%s-%c.h5", 'b'); \ + sprintf(sv[H5FD_MEM_BTREE], "%%s-%c.h5", 'b'); \ memb_name[H5FD_MEM_BTREE] = sv[H5FD_MEM_BTREE]; \ memb_addr[H5FD_MEM_BTREE] = HADDR_MAX / 6; \ - sprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r'); \ + sprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r'); \ memb_name[H5FD_MEM_DRAW] = sv[H5FD_MEM_DRAW]; \ memb_addr[H5FD_MEM_DRAW] = HADDR_MAX / 3; \ - sprintf(sv[H5FD_MEM_GHEAP], "%%s-%c.h5", 'g'); \ + sprintf(sv[H5FD_MEM_GHEAP], "%%s-%c.h5", 'g'); \ memb_name[H5FD_MEM_GHEAP] = sv[H5FD_MEM_GHEAP]; \ memb_addr[H5FD_MEM_GHEAP] = HADDR_MAX / 2; \ - sprintf(sv[H5FD_MEM_LHEAP], "%%s-%c.h5", 'l'); \ + sprintf(sv[H5FD_MEM_LHEAP], "%%s-%c.h5", 'l'); \ memb_name[H5FD_MEM_LHEAP] = sv[H5FD_MEM_LHEAP]; \ memb_addr[H5FD_MEM_LHEAP] = HADDR_MAX * 2 / 3; \ - sprintf(sv[H5FD_MEM_OHDR], "%%s-%c.h5", 'o'); \ + sprintf(sv[H5FD_MEM_OHDR], "%%s-%c.h5", 'o'); \ memb_name[H5FD_MEM_OHDR] = sv[H5FD_MEM_OHDR]; \ memb_addr[H5FD_MEM_OHDR] = HADDR_MAX * 5 / 6; \ } diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index 16fd24a..6815ea6 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -63,8 +63,8 @@ static unsigned int g_verbosity = DEFAULT_VERBOSITY; #define LOGPRINT(lvl, ...) \ do { \ if ((lvl) <= g_verbosity) { \ - fprintf(g_log_stream, __VA_ARGS__); \ - fflush(g_log_stream); \ + fprintf(g_log_stream, __VA_ARGS__); \ + fflush(g_log_stream); \ } \ } while (0) @@ -150,8 +150,8 @@ _populate_filepath(const char *dirname, const char *_basename, hid_t fapl_id, ch } if (snprintf(_path, H5FD_SPLITTER_PATH_MAX, "%s%s%s", dirname, - (dirname[strlen(dirname)] == '/') ? "" : "/", /* slash iff needed */ - _basename) > H5FD_SPLITTER_PATH_MAX) { + (dirname[strlen(dirname)] == '/') ? "" : "/", /* slash iff needed */ + _basename) > H5FD_SPLITTER_PATH_MAX) { TEST_ERROR; } @@ -288,16 +288,16 @@ error: } \ if (_x != (len)) { \ size_t _y = 0; \ - printf("First bytes differ at %zu\n", _x); \ - printf("exp "); \ + printf("First bytes differ at %zu\n", _x); \ + printf("exp "); \ for (_y = _x; _y < (len); _y++) { \ - printf("%02X", (unsigned char)(exp)[_y]); \ + printf("%02X", (unsigned char)(exp)[_y]); \ } \ - printf("\nact "); \ + printf("\nact "); \ for (_y = _x; _y < (len); _y++) { \ - printf("%02X", (unsigned char)(act)[_y]); \ + printf("%02X", (unsigned char)(act)[_y]); \ } \ - printf("\n"); \ + printf("\n"); \ } \ } while (0); /* end PRINT_BUFFER_DIFF */ @@ -1785,7 +1785,7 @@ _verify_datasets(unsigned min_dset, unsigned max_dset, hid_t *filespace_ids, hid if ((unsigned)data_chunk[k][l] != ((DSET_DIM * DSET_DIM * m) + (DSET_DIM * (i + k)) + j + l)) { snprintf(mesg, MIRR_MESG_SIZE, " MISMATCH [%d][%d][%d][%d][%d]\n", i, j, m, - k, l); + k, l); FAIL_PUTS_ERROR(mesg); } } diff --git a/test/ntypes.c b/test/ntypes.c index 106a730..8a9b716 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -1884,14 +1884,14 @@ test_vl_dtype(hid_t file) if (wdata[i].len != rdata[i].len) { H5_FAILED(); printf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, - (int)wdata[i].len, (int)i, (int)rdata[i].len); + (int)wdata[i].len, (int)i, (int)rdata[i].len); goto error; } /* end if */ for (t1 = (hvl_t *)wdata[i].p, t2 = (hvl_t *)rdata[i].p, j = 0; j < rdata[i].len; j++, t1++, t2++) { if (t1->len != t2->len) { H5_FAILED(); printf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, - (int)wdata[i].len, (int)i, (int)rdata[i].len); + (int)wdata[i].len, (int)i, (int)rdata[i].len); goto error; } /* end if */ @@ -1908,7 +1908,7 @@ test_vl_dtype(hid_t file) if (((unsigned int *)t1->p)[k] != ((unsigned int *)tmp)[k]) { H5_FAILED(); printf(" VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", (unsigned)i, - ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]); + ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]); goto error; } /* end if */ } /* end for */ @@ -2061,13 +2061,13 @@ test_vlstr_dtype(hid_t file) if (strlen(wdata[i]) != strlen(rdata[i])) { H5_FAILED(); printf(" VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, - (int)strlen(wdata[i]), (int)i, (int)strlen(rdata[i])); + (int)strlen(wdata[i]), (int)i, (int)strlen(rdata[i])); goto error; } /* end if */ if (strcmp(wdata[i], rdata[i]) != 0) { H5_FAILED(); - printf(" VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], - (int)i, rdata[i]); + printf(" VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i, + rdata[i]); goto error; } /* end if */ } /* end for */ @@ -2194,13 +2194,13 @@ test_str_dtype(hid_t file) if (strlen(wdata[i]) != strlen(rdata[i])) { H5_FAILED(); printf(" data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, - (int)strlen(wdata[i]), (int)i, (int)strlen(rdata[i])); + (int)strlen(wdata[i]), (int)i, (int)strlen(rdata[i])); goto error; } /* end if */ if (strcmp(wdata[i], rdata[i]) != 0) { H5_FAILED(); printf(" data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i, - rdata[i]); + rdata[i]); goto error; } /* end if */ } /* end for */ diff --git a/test/reserved.c b/test/reserved.c index 2d6d1ba..4977053 100644 --- a/test/reserved.c +++ b/test/reserved.c @@ -509,8 +509,7 @@ main(void) return num_errs; } else { - puts( - "All address space reservation tests skippped - Incompatible with current Virtual File Driver"); + puts("All address space reservation tests skippped - Incompatible with current Virtual File Driver"); } #endif /* BROKEN */ diff --git a/test/ros3.c b/test/ros3.c index c6e7517..7e7e58a 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -106,7 +106,7 @@ */ #define JSFAILED_AT() \ { \ - printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -318,7 +318,7 @@ jserr_str(const char *expected, const char *actual, const char *reason) *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(expected, actual, reason) \ - if (strcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -363,7 +363,7 @@ jserr_str(const char *expected, const char *actual, const char *reason) *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(actual, expected, reason) \ - if (strcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -1764,7 +1764,7 @@ main(void) bucket_url_env = getenv("HDF5_ROS3_TEST_BUCKET_URL"); if (bucket_url_env == NULL || bucket_url_env[0] == '\0') { printf("WARNING: S3 bucket url is not defined in environment " - "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); + "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); } else { strncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE); @@ -1772,26 +1772,26 @@ main(void) } if (S3_TEST_MAX_URL_SIZE < snprintf(url_text_restricted, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", - (const char *)s3_test_bucket_url, - (const char *)S3_TEST_RESOURCE_TEXT_RESTRICTED)) { + (const char *)s3_test_bucket_url, + (const char *)S3_TEST_RESOURCE_TEXT_RESTRICTED)) { printf("* ros3 setup failed (text_restricted) ! *\n"); return 1; } if (S3_TEST_MAX_URL_SIZE < snprintf(url_text_public, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", - (const char *)s3_test_bucket_url, - (const char *)S3_TEST_RESOURCE_TEXT_PUBLIC)) { + (const char *)s3_test_bucket_url, + (const char *)S3_TEST_RESOURCE_TEXT_PUBLIC)) { printf("* ros3 setup failed (text_public) ! *\n"); return 1; } if (S3_TEST_MAX_URL_SIZE < snprintf(url_h5_public, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", - (const char *)s3_test_bucket_url, - (const char *)S3_TEST_RESOURCE_H5_PUBLIC)) { + (const char *)s3_test_bucket_url, + (const char *)S3_TEST_RESOURCE_H5_PUBLIC)) { printf("* ros3 setup failed (h5_public) ! *\n"); return 1; } if (S3_TEST_MAX_URL_SIZE < snprintf(url_missing, S3_TEST_MAX_URL_SIZE, "%s/%s", - (const char *)s3_test_bucket_url, - (const char *)S3_TEST_RESOURCE_MISSING)) { + (const char *)s3_test_bucket_url, + (const char *)S3_TEST_RESOURCE_MISSING)) { printf("* ros3 setup failed (missing) ! *\n"); return 1; } @@ -1811,12 +1811,11 @@ main(void) if (SUCCEED == H5FD_s3comms_load_aws_profile(S3_TEST_PROFILE_NAME, s3_test_aws_access_key_id, s3_test_aws_secret_access_key, s3_test_aws_region)) { s3_test_credentials_loaded = 1; - strncpy(restricted_access_fa.aws_region, (const char *)s3_test_aws_region, - H5FD_ROS3_MAX_REGION_LEN); + strncpy(restricted_access_fa.aws_region, (const char *)s3_test_aws_region, H5FD_ROS3_MAX_REGION_LEN); strncpy(restricted_access_fa.secret_id, (const char *)s3_test_aws_access_key_id, - H5FD_ROS3_MAX_SECRET_ID_LEN); + H5FD_ROS3_MAX_SECRET_ID_LEN); strncpy(restricted_access_fa.secret_key, (const char *)s3_test_aws_secret_access_key, - H5FD_ROS3_MAX_SECRET_KEY_LEN); + H5FD_ROS3_MAX_SECRET_KEY_LEN); } /****************** diff --git a/test/s3comms.c b/test/s3comms.c index 162d290..832c996 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -96,7 +96,7 @@ */ #define JSFAILED_AT() \ { \ - printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -311,7 +311,7 @@ jserr_str(const char *expected, const char *actual, const char *reason) *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(expected, actual, reason) \ - if (strcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -359,7 +359,7 @@ jserr_str(const char *expected, const char *actual, const char *reason) *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(actual, expected, reason) \ - if (strcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -1242,7 +1242,7 @@ test_HMAC_SHA256(void) "AWS4-HMAC-SHA256\n20130524T000000Z\n20130524/us-east-1/s3/" "aws4_request\n7344ae5b7ee6c3e7e6b0fe0640412a37625d1fbfff95c48bbb2dc43964946972", strlen("AWS4-HMAC-SHA256\n20130524T000000Z\n20130524/us-east-1/s3/" - "aws4_request\n7344ae5b7ee6c3e7e6b0fe0640412a37625d1fbfff95c48bbb2dc43964946972"), + "aws4_request\n7344ae5b7ee6c3e7e6b0fe0640412a37625d1fbfff95c48bbb2dc43964946972"), "f0e8bdb87c964420e857bd35b5d6ed310bd44f0170aba48dd91039c6036bdb41", SHA256_DIGEST_LENGTH * 2 + 1, /* +1 for null terminator */ }, @@ -1786,7 +1786,7 @@ test_s3r_get_filesize(void) } FAIL_IF(S3_TEST_MAX_URL_SIZE < snprintf(url_raven, S3_TEST_MAX_URL_SIZE, "%s/%s", s3_test_bucket_url, - S3_TEST_RESOURCE_TEXT_PUBLIC)); + S3_TEST_RESOURCE_TEXT_PUBLIC)); JSVERIFY(0, H5FD_s3comms_s3r_get_filesize(NULL), "filesize of the null handle should be 0") @@ -1856,13 +1856,13 @@ test_s3r_open(void) ******************/ FAIL_IF(S3_TEST_MAX_URL_SIZE < snprintf(url_shakespeare, S3_TEST_MAX_URL_SIZE, "%s/%s", - s3_test_bucket_url, S3_TEST_RESOURCE_TEXT_RESTRICTED)); + s3_test_bucket_url, S3_TEST_RESOURCE_TEXT_RESTRICTED)); FAIL_IF(S3_TEST_MAX_URL_SIZE < snprintf(url_missing, S3_TEST_MAX_URL_SIZE, "%s/%s", s3_test_bucket_url, - S3_TEST_RESOURCE_MISSING)); + S3_TEST_RESOURCE_MISSING)); FAIL_IF(S3_TEST_MAX_URL_SIZE < snprintf(url_raven, S3_TEST_MAX_URL_SIZE, "%s/%s", s3_test_bucket_url, - S3_TEST_RESOURCE_TEXT_PUBLIC)); + S3_TEST_RESOURCE_TEXT_PUBLIC)); /* Set given bucket url with invalid/inactive port number for badport. * Note, this sort of micro-management of parsed_url_t is not advised @@ -1880,8 +1880,8 @@ test_s3r_open(void) FAIL_IF(5 < snprintf(purl->port, 5, "1234")) } FAIL_IF(S3_TEST_MAX_URL_SIZE < snprintf(url_raven_badport, S3_TEST_MAX_URL_SIZE, "%s://%s:%s/%s", - purl->scheme, purl->host, purl->port, - S3_TEST_RESOURCE_TEXT_PUBLIC)); + purl->scheme, purl->host, purl->port, + S3_TEST_RESOURCE_TEXT_PUBLIC)); curl_global_init(CURL_GLOBAL_DEFAULT); curl_ready = TRUE; @@ -2052,7 +2052,7 @@ test_s3r_read(void) curl_global_init(CURL_GLOBAL_DEFAULT); curl_ready = TRUE; FAIL_IF(S3_TEST_MAX_URL_SIZE < snprintf(url_raven, S3_TEST_MAX_URL_SIZE, "%s/%s", s3_test_bucket_url, - S3_TEST_RESOURCE_TEXT_PUBLIC)); + S3_TEST_RESOURCE_TEXT_PUBLIC)); for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++) buffer[i] = '\0'; @@ -2611,7 +2611,7 @@ main(void) bucket_url_env = getenv("HDF5_ROS3_TEST_BUCKET_URL"); if (bucket_url_env == NULL || bucket_url_env[0] == '\0') { printf("WARNING: S3 bucket url is not defined in environment " - "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); + "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); } else { strncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE); diff --git a/test/set_extent.c b/test/set_extent.c index 141cc0c..4b0672e 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -42,12 +42,12 @@ const char *FILENAME[] = {"set_extent1", "set_extent2", "set_extent3", "set_exte #define FILL_VALUE (-1) #define DO_RANKS_PRINT_CONFIG(TEST) \ { \ - printf(" Config:\n"); \ - printf(" Test: %s\n", TEST); \ - printf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \ - printf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \ - printf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no")); \ - printf(" Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled")); \ + printf(" Config:\n"); \ + printf(" Test: %s\n", TEST); \ + printf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \ + printf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \ + printf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no")); \ + printf(" Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled")); \ } /* end DO_RANKS_PRINT_CONFIG */ #define RANK1 1 @@ -338,8 +338,8 @@ do_ranks(hid_t fapl, hbool_t new_format) if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4") printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ @@ -348,10 +348,9 @@ do_ranks(hid_t fapl, hbool_t new_format) if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length") - printf(" Index: %s\n", - index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ } @@ -360,10 +359,9 @@ do_ranks(hid_t fapl, hbool_t new_format) if (!(config & CONFIG_EARLY_ALLOC)) { if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 with sparse allocation") - printf(" Index: %s\n", - index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ @@ -372,9 +370,9 @@ do_ranks(hid_t fapl, hbool_t new_format) index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length with sparse allocation") printf(" Index: %s\n", - index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ } @@ -2692,11 +2690,11 @@ test_random_rank4_dump(unsigned ndim_sets, hsize_t dim_log[][4], hsize_t cdims[4 unsigned i; printf(" Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], (unsigned)cdims[1], - (unsigned)cdims[2], (unsigned)cdims[3]); + (unsigned)cdims[2], (unsigned)cdims[3]); printf(" Log of dataset dimensions (oldest first):\n"); for (i = 0; i < ndim_sets; i++) printf(" Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, (unsigned)dim_log[i][0], - (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]); + (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]); if (j >= 0) printf(" First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m); } /* end test_random_rank4_dump */ diff --git a/test/swmr_common.c b/test/swmr_common.c index c55acb1..1a602b2 100644 --- a/test/swmr_common.c +++ b/test/swmr_common.c @@ -279,7 +279,7 @@ print_metadata_retries_info(hid_t fid) for (j = 0; j < info.nbins; j++) { if (info.retries[i][j]) fprintf(stderr, "\t# of retries for %u - %u retries: %u\n", power, (power * 10) - 1, - info.retries[i][j]); + info.retries[i][j]); power *= 10; } /* end for */ } /* end for */ diff --git a/test/swmr_reader.c b/test/swmr_reader.c index 0662f3c..5bb81129 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -130,9 +130,9 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na fprintf(verbose_file, "*** ERROR ***\n"); fprintf(verbose_file, "Incorrect record value!\n"); fprintf(verbose_file, - "Time = %llu.%llu, Symbol = '%s', # of records = %lld, record->rec_id = %llu\n", - (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, sym_name, - (long long)snpoints, (unsigned long long)record->rec_id); + "Time = %llu.%llu, Symbol = '%s', # of records = %lld, record->rec_id = %llu\n", + (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, sym_name, + (long long)snpoints, (unsigned long long)record->rec_id); } /* end if */ return -1; } /* end if */ diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c index b3ed058..b8afccf 100644 --- a/test/swmr_remove_reader.c +++ b/test/swmr_remove_reader.c @@ -135,7 +135,7 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor fprintf(stderr, "*** ERROR ***\n"); fprintf(stderr, "Incorrect record value!\n"); fprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name, - (long long)snpoints, (unsigned long long)record->rec_id); + (long long)snpoints, (unsigned long long)record->rec_id); return -1; } /* end if */ } /* end if */ diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c index fae22c1..19c07ad 100644 --- a/test/swmr_sparse_reader.c +++ b/test/swmr_sparse_reader.c @@ -114,7 +114,7 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t /* Emit informational message */ if (verbose) fprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX "\n", symbol->name, - (uintmax_t)start[0], (uintmax_t)start[1]); + (uintmax_t)start[0], (uintmax_t)start[1]); /* Read record from dataset */ record->rec_id = (uint64_t)ULLONG_MAX; @@ -125,9 +125,8 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t if (record->rec_id != start[1]) { fprintf(stderr, "*** ERROR ***\n"); fprintf(stderr, "Incorrect record value!\n"); - fprintf(stderr, - "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX ", record->rec_id = %" PRIu64 "\n", - symbol->name, (uintmax_t)start[0], (uintmax_t)start[1], record->rec_id); + fprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX ", record->rec_id = %" PRIu64 "\n", + symbol->name, (uintmax_t)start[0], (uintmax_t)start[1], record->rec_id); return -1; } /* end if */ diff --git a/test/tattr.c b/test/tattr.c index d8d1114..4b8ffff 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -908,9 +908,9 @@ test_attr_compound_read(hid_t fapl) for (j = 0; j < ATTR4_DIM2; j++) if (memcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", - __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); + __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", - __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d); + __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d); TestErrPrintf( "%d: attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n", __LINE__, i, j, attr_data4[i][j].c, i, j, read_data4[i][j].c); @@ -1048,7 +1048,7 @@ test_attr_scalar_read(hid_t fapl) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(rdata, attr_data5)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread", - (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__); + (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__); /* Get the attribute's dataspace */ sid = H5Aget_space(attr); @@ -6586,8 +6586,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) if (order == H5_ITER_INC) snprintf(attrname, sizeof(attrname), "attr %02u", (u + 1)); else - snprintf(attrname, sizeof(attrname), "attr %02u", - ((max_compact * 2) - (u + 2))); + snprintf(attrname, sizeof(attrname), "attr %02u", ((max_compact * 2) - (u + 2))); ret = strcmp(attrname, tmpname); VERIFY(ret, 0, "H5Aget_name_by_idx"); } /* end for */ @@ -6701,7 +6700,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) snprintf(attrname, sizeof(attrname), "attr %02u", ((u * 2) + 1)); else snprintf(attrname, sizeof(attrname), "attr %02u", - ((max_compact * 2) - ((u * 2) + 2))); + ((max_compact * 2) - ((u * 2) + 2))); ret = strcmp(attrname, tmpname); VERIFY(ret, 0, "H5Aget_name_by_idx"); } /* end for */ @@ -6754,7 +6753,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) snprintf(attrname, sizeof(attrname), "attr %02u", ((u * 2) + 3)); else snprintf(attrname, sizeof(attrname), "attr %02u", - ((max_compact * 2) - ((u * 2) + 4))); + ((max_compact * 2) - ((u * 2) + 4))); ret = strcmp(attrname, tmpname); VERIFY(ret, 0, "H5Aget_name_by_idx"); } /* end for */ diff --git a/test/testframe.c b/test/testframe.c index fa50fed..69848c7 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -89,7 +89,7 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const /* Reallocate array */ if (NULL == (newTest = (TestStruct *)realloc(Test, newAlloc * sizeof(TestStruct)))) { printf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, - newAlloc); + newAlloc); exit(EXIT_FAILURE); } /* end if */ @@ -630,7 +630,7 @@ TestAlarmOn(void) { #ifdef H5_HAVE_ALARM char * env_val = getenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ - unsigned long alarm_sec = H5_ALARM_SEC; /* Number of seconds before alarm goes off */ + unsigned long alarm_sec = H5_ALARM_SEC; /* Number of seconds before alarm goes off */ /* Get the alarm value from the environment variable, if set */ if (env_val != NULL) diff --git a/test/testhdf5.h b/test/testhdf5.h index 1145b94..64698b4 100644 --- a/test/testhdf5.h +++ b/test/testhdf5.h @@ -136,7 +136,7 @@ "%s \n", \ (where), (int)__LINE__, __FILE__, x); \ } \ - if (strcmp(x, val) != 0) { \ + if (strcmp(x, val) != 0) { \ TestErrPrintf("*** UNEXPECTED VALUE from %s should be %s, but is %s at line %4d " \ "in %s\n", \ where, val, x, (int)__LINE__, __FILE__); \ diff --git a/test/tfile.c b/test/tfile.c index 9f80925..e799ec8 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -2919,8 +2919,8 @@ test_userblock_file_size(const char *env_h5_drvr) herr_t ret; /* Generic return value */ /* Don't run with multi/split, family or direct drivers */ - if (!strcmp(env_h5_drvr, "multi") || !strcmp(env_h5_drvr, "split") || - !strcmp(env_h5_drvr, "family") || !strcmp(env_h5_drvr, "direct")) + if (!strcmp(env_h5_drvr, "multi") || !strcmp(env_h5_drvr, "split") || !strcmp(env_h5_drvr, "family") || + !strcmp(env_h5_drvr, "direct")) return; /* Output message about test being performed */ diff --git a/test/tgenprop.c b/test/tgenprop.c index 933b3ce..ff42436 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -693,7 +693,7 @@ test_genprop_basic_list(void) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Close list */ ret = H5Pclose(lid1); @@ -786,7 +786,7 @@ test_genprop_basic_list_prop(void) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); @@ -798,7 +798,7 @@ test_genprop_basic_list_prop(void) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Delete permanent property */ ret = H5Premove(lid1, PROP2_NAME); @@ -835,7 +835,7 @@ test_genprop_basic_list_prop(void) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Close list */ ret = H5Pclose(lid1); @@ -1243,7 +1243,7 @@ test_genprop_list_callback(void) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); @@ -1258,7 +1258,7 @@ test_genprop_list_callback(void) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Verify get callback information for properties tracked */ VERIFY(prop1_cb_info.get_count, 1, "H5Pget"); diff --git a/test/th5s.c b/test/th5s.c index b231a2f..045720e 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -819,7 +819,7 @@ test_h5s_zero_dim(void) if (rdata_real[i][j][k] != wdata_real[i][j][k]) { H5_FAILED(); printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, - rdata_real[i][j][k], wdata_real[i][j][k]); + rdata_real[i][j][k], wdata_real[i][j][k]); } } } @@ -1046,7 +1046,7 @@ test_h5s_zero_dim(void) if (rdata_real[i][j][k] != wdata_real[i][j][k]) { H5_FAILED(); printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, - rdata_real[i][j][k], wdata_real[i][j][k]); + rdata_real[i][j][k], wdata_real[i][j][k]); } } } @@ -2453,7 +2453,7 @@ test_h5s_compound_scalar_read(void) printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, - (double)rdata.f); + (double)rdata.f); TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c2); } /* end if */ diff --git a/test/thread_id.c b/test/thread_id.c index 62458ed..ed1e0a8 100644 --- a/test/thread_id.c +++ b/test/thread_id.c @@ -186,7 +186,7 @@ my_err(int code, const char *fmt, ...) #define threads_failure(_call, _result) \ do { \ - my_errx(EXIT_FAILURE, "%s.%d: " #_call ": %s", __func__, __LINE__, strerror(_result)); \ + my_errx(EXIT_FAILURE, "%s.%d: " #_call ": %s", __func__, __LINE__, strerror(_result)); \ } while (false) #define NTHREADS 5 diff --git a/test/timer.c b/test/timer.c index c0f9be2..88565bd 100644 --- a/test/timer.c +++ b/test/timer.c @@ -391,8 +391,7 @@ main(void) nerrors += test_timer_functionality() < 0 ? 1 : 0; if (nerrors) { - printf("***** %d platform-independent timer TEST%s FAILED! *****\n", nerrors, - nerrors > 1 ? "S" : ""); + printf("***** %d platform-independent timer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); return 1; } else { diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index f2d07a8..0688133 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -809,7 +809,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) ret = (int)H5Sget_select_hyper_nblocks(sid2); VERIFY(ret, 1, "H5Sget_select_hyper_nblocks"); coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * - 2); /* allocate space for the hyperslab blocks */ + 2); /* allocate space for the hyperslab blocks */ ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); VERIFY(coords[0], 2, "Hyperslab Coordinates"); @@ -838,7 +838,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) ret = (int)H5Sget_select_elem_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_elem_npoints"); coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * - sizeof(hsize_t)); /* allocate space for the element points */ + sizeof(hsize_t)); /* allocate space for the element points */ ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); VERIFY(coords[0], coord1[0][0], "Element Coordinates"); @@ -1133,7 +1133,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) ret = (int)H5Sget_select_hyper_nblocks(sid3); VERIFY(ret, 15, "H5Sget_select_hyper_nblocks"); coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * - 2); /* allocate space for the hyperslab blocks */ + 2); /* allocate space for the hyperslab blocks */ ret = H5Sget_select_hyper_blocklist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); VERIFY(coords[0], 2, "Hyperslab Coordinates"); @@ -1186,7 +1186,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) ret = (int)H5Sget_select_elem_npoints(sid3); VERIFY(ret, 10, "H5Sget_select_elem_npoints"); coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * - sizeof(hsize_t)); /* allocate space for the element points */ + sizeof(hsize_t)); /* allocate space for the element points */ ret = H5Sget_select_elem_pointlist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); VERIFY(coords[0], coord1[0][0], "Element Coordinates"); diff --git a/test/tselect.c b/test/tselect.c index 20fdb71..ece3689 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -1386,10 +1386,10 @@ test_select_hyper_stride(hid_t xfer_plist) tbuf = wbuf + loc1[i]; tbuf2 = rbuf + loc2[i]; if (*tbuf != *tbuf2) { - printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, - (int)loc1[i], i, (int)loc2[i]); + printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, (int)loc1[i], + i, (int)loc2[i]); printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf, - (void *)tbuf2); + (void *)tbuf2); TestErrPrintf("*tbuf=%u, *tbuf2=%u\n", (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ } /* end for */ @@ -1584,8 +1584,8 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) /* Allocate write & read buffers */ wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); CHECK_PTR(wbuf, "malloc"); - rbuf = (uint16_t *)calloc(sizeof(uint16_t), - (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); + rbuf = + (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ @@ -1730,8 +1730,8 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) /* Allocate write & read buffers */ wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); CHECK_PTR(wbuf, "malloc"); - rbuf = (uint16_t *)calloc(sizeof(uint16_t), - (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); + rbuf = + (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ @@ -5750,13 +5750,13 @@ test_select_hyper_and_2d(void) if ((i >= 5 && i <= 9) && (j >= 5 && j <= 9)) { if (*tbuf != *tbuf2) printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + (int)*tbuf); } /* end else */ } /* end for */ @@ -5891,13 +5891,13 @@ test_select_hyper_xor_2d(void) ((i >= 10 && i <= 14) && (j >= 5 && j <= 14))) { if (*tbuf != *tbuf2) printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + (int)*tbuf); } /* end else */ } /* end for */ @@ -6030,13 +6030,13 @@ test_select_hyper_notb_2d(void) if (((i >= 0 && i <= 4) && (j >= 0 && j <= 9)) || ((i >= 5 && i <= 9) && (j >= 0 && j <= 4))) { if (*tbuf != *tbuf2) printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + (int)*tbuf); } /* end else */ } /* end for */ @@ -6265,7 +6265,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) wbuf = (int *)malloc(sizeof(int) * SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5); CHECK_PTR(wbuf, "malloc"); rbuf = (int *)calloc(sizeof(int), - (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5)); + (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5)); CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ @@ -10862,15 +10862,13 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ assert(edge_size > 0); assert(edge_size <= 1000); - snprintf(test_desc_0, sizeof(test_desc_0), "\tn-cube slice through m-cube (n <= m) test %d.\n", - test_num); + snprintf(test_desc_0, sizeof(test_desc_0), "\tn-cube slice through m-cube (n <= m) test %d.\n", test_num); MESSAGE(7, (test_desc_0)); /* This statement must be updated if SS_DR_MAX_RANK is changed */ - snprintf(test_desc_1, sizeof(test_desc_1), - "\t\tranks: %d/%d offset: %d dim_selected: %d/%d/%d/%d/%d.\n", small_rank, large_rank, offset, - (int)dim_selected[0], (int)dim_selected[1], (int)dim_selected[2], (int)dim_selected[3], - (int)dim_selected[4]); + snprintf(test_desc_1, sizeof(test_desc_1), "\t\tranks: %d/%d offset: %d dim_selected: %d/%d/%d/%d/%d.\n", + small_rank, large_rank, offset, (int)dim_selected[0], (int)dim_selected[1], (int)dim_selected[2], + (int)dim_selected[3], (int)dim_selected[4]); MESSAGE(7, (test_desc_1)); /* copy the edge size into the dims array */ @@ -11123,15 +11121,15 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i assert(dims_selected <= large_rank); snprintf(test_desc_0, sizeof(test_desc_0), - "\tcheckerboard n-cube slice through m-cube (n <= m) test %d.\n", test_num); + "\tcheckerboard n-cube slice through m-cube (n <= m) test %d.\n", test_num); MESSAGE(7, (test_desc_0)); /* This statement must be updated if SS_DR_MAX_RANK is changed */ snprintf(test_desc_1, sizeof(test_desc_1), - "\tranks: %d/%d edge/chkr size: %d/%d offset: %d dim_selected: %d/%d/%d/%d/%d:%d.\n", - small_rank, large_rank, (int)edge_size, (int)checker_size, offset, (int)dim_selected[0], - (int)dim_selected[1], (int)dim_selected[2], (int)dim_selected[3], (int)dim_selected[4], - dims_selected); + "\tranks: %d/%d edge/chkr size: %d/%d offset: %d dim_selected: %d/%d/%d/%d/%d:%d.\n", small_rank, + large_rank, (int)edge_size, (int)checker_size, offset, (int)dim_selected[0], + (int)dim_selected[1], (int)dim_selected[2], (int)dim_selected[3], (int)dim_selected[4], + dims_selected); MESSAGE(7, (test_desc_1)); /* copy the edge size into the dims array */ @@ -11668,15 +11666,14 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int assert(dims_selected <= large_rank); snprintf(test_desc_0, sizeof(test_desc_0), - "\tirregular sub set of n-cube slice through m-cube (n <= m) test %d.\n", test_num); + "\tirregular sub set of n-cube slice through m-cube (n <= m) test %d.\n", test_num); MESSAGE(7, (test_desc_0)); /* This statement must be updated if SS_DR_MAX_RANK is changed */ snprintf(test_desc_1, sizeof(test_desc_1), - "\tranks: %d/%d edge: %d s/p offset: %d/%d dim_selected: %d/%d/%d/%d/%d:%d.\n", small_rank, - large_rank, edge_size, slice_offset, pattern_offset, (int)dim_selected[0], - (int)dim_selected[1], (int)dim_selected[2], (int)dim_selected[3], (int)dim_selected[4], - dims_selected); + "\tranks: %d/%d edge: %d s/p offset: %d/%d dim_selected: %d/%d/%d/%d/%d:%d.\n", small_rank, + large_rank, edge_size, slice_offset, pattern_offset, (int)dim_selected[0], (int)dim_selected[1], + (int)dim_selected[2], (int)dim_selected[3], (int)dim_selected[4], dims_selected); MESSAGE(7, (test_desc_1)); /* copy the edge size into the dims array */ diff --git a/test/tsohm.c b/test/tsohm.c index 26671b5..37db72d 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -615,17 +615,17 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ */ #define TSOHM_S1H_VERIFY_DATA(dset_id, dtype_id) \ { \ - memset(&rdata, 0, sizeof(rdata)); \ + memset(&rdata, 0, sizeof(rdata)); \ if (0 > H5Dread((dset_id), (dtype_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata)) { \ H5_FAILED(); \ AT(); \ - printf("Can't read data\n"); \ + printf("Can't read data\n"); \ goto error; \ } \ - if ((rdata.i1 != wdata.i1) || (rdata.i2 != wdata.i2) || strcmp(rdata.str, wdata.str) != 0) { \ + if ((rdata.i1 != wdata.i1) || (rdata.i2 != wdata.i2) || strcmp(rdata.str, wdata.str) != 0) { \ H5_FAILED(); \ AT(); \ - printf("incorrect read data\n"); \ + printf("incorrect read data\n"); \ goto error; \ } \ } /* TSOHM_S1H_VERIFY_DATA() definition */ @@ -1532,19 +1532,19 @@ size2_dump_struct(const char *name, size2_helper_struct *sizes) puts(name); printf(" empty size: %llu\n", (unsigned long long)sizes->empty_size); printf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset, - (unsigned long long)(sizes->first_dset - sizes->empty_size)); + (unsigned long long)(sizes->first_dset - sizes->empty_size)); printf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset, - (unsigned long long)(sizes->second_dset - sizes->first_dset)); + (unsigned long long)(sizes->second_dset - sizes->first_dset)); printf(" dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1, - (unsigned long long)(sizes->dsets1 - sizes->second_dset)); + (unsigned long long)(sizes->dsets1 - sizes->second_dset)); printf(" dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2, - (unsigned long long)(sizes->dsets2 - sizes->dsets1)); + (unsigned long long)(sizes->dsets2 - sizes->dsets1)); printf(" interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved, - (unsigned long long)(sizes->interleaved - sizes->dsets2)); + (unsigned long long)(sizes->interleaved - sizes->dsets2)); printf(" attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1, - (unsigned long long)(sizes->attrs1 - sizes->interleaved)); + (unsigned long long)(sizes->attrs1 - sizes->interleaved)); printf(" attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2, - (unsigned long long)(sizes->attrs2 - sizes->attrs1)); + (unsigned long long)(sizes->attrs2 - sizes->attrs1)); } /* size2_dump_struct */ #endif /* NOT_NOW */ diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index eb247a2..f93cd6a 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -249,12 +249,12 @@ walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSE fprintf(stderr, "Unexpected error stack entry!\n"); fprintf(stderr, "Stack entry: %d\n", n); fprintf(stderr, - "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID - ", line = %u, func = '%s', file = '%s', desc = '%s'\n", - err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name, - err_desc->desc); + "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID + ", line = %u, func = '%s', file = '%s', desc = '%s'\n", + err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name, + err_desc->desc); fprintf(stderr, "Expected: maj_num = %" PRIxHID ", min_num = %" PRIxHID "\n", expected_g[n].maj_num, - expected_g[n].min_num); + expected_g[n].min_num); error_flag_g = -1; return SUCCEED; diff --git a/test/tvltypes.c b/test/tvltypes.c index be81b4a..93711a4 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -2844,8 +2844,7 @@ test_vltypes_fill_value(void) if ((i % 2) == select_offset[0]) { if (strcmp(rbuf[i].str_id, "foobar") != 0 || strcmp(rbuf[i].str_name, "") != 0 || rbuf[i].str_desc || strcmp(rbuf[i].str_orig, "\0") != 0 || - strcmp(rbuf[i].str_stat, "dead") != 0 || - strcmp(rbuf[i].str_form, "liquid") != 0 || + strcmp(rbuf[i].str_stat, "dead") != 0 || strcmp(rbuf[i].str_form, "liquid") != 0 || strcmp(rbuf[i].str_unit, "meter") != 0) { TestErrPrintf("%d: VL data doesn't match!, index(i) = %d\n", __LINE__, (int)i); continue; @@ -2902,8 +2901,7 @@ test_vltypes_fill_value(void) if ((i % 2) == select_offset[0]) { if (strcmp(rbuf[i].str_id, "foobar") != 0 || strcmp(rbuf[i].str_name, "") != 0 || rbuf[i].str_desc || strcmp(rbuf[i].str_orig, "\0") != 0 || - strcmp(rbuf[i].str_stat, "dead") != 0 || - strcmp(rbuf[i].str_form, "liquid") != 0 || + strcmp(rbuf[i].str_stat, "dead") != 0 || strcmp(rbuf[i].str_form, "liquid") != 0 || strcmp(rbuf[i].str_unit, "meter") != 0) { TestErrPrintf("%d: VL data doesn't match!, index(i) = %d\n", __LINE__, (int)i); continue; @@ -3032,8 +3030,7 @@ test_vltypes_fill_value(void) else { if (strcmp(rbuf[i].str_id, "foobar") != 0 || strcmp(rbuf[i].str_name, "") != 0 || rbuf[i].str_desc || strcmp(rbuf[i].str_orig, "\0") != 0 || - strcmp(rbuf[i].str_stat, "dead") != 0 || - strcmp(rbuf[i].str_form, "liquid") != 0 || + strcmp(rbuf[i].str_stat, "dead") != 0 || strcmp(rbuf[i].str_form, "liquid") != 0 || strcmp(rbuf[i].str_unit, "meter") != 0) { TestErrPrintf("%d: VL data doesn't match!, index(i)=%d\n", __LINE__, (int)i); continue; @@ -3120,8 +3117,7 @@ test_vltypes_fill_value(void) else { if (strcmp(rbuf[i].str_id, "foobar") != 0 || strcmp(rbuf[i].str_name, "") != 0 || rbuf[i].str_desc || strcmp(rbuf[i].str_orig, "\0") != 0 || - strcmp(rbuf[i].str_stat, "dead") != 0 || - strcmp(rbuf[i].str_form, "liquid") != 0 || + strcmp(rbuf[i].str_stat, "dead") != 0 || strcmp(rbuf[i].str_form, "liquid") != 0 || strcmp(rbuf[i].str_unit, "meter") != 0) { TestErrPrintf("%d: VL data doesn't match!, index(i)=%d\n", __LINE__, (int)i); continue; diff --git a/test/twriteorder.c b/test/twriteorder.c index 07b20f8..f293bf7 100644 --- a/test/twriteorder.c +++ b/test/twriteorder.c @@ -189,7 +189,7 @@ parse_option(int argc, char *const argv[]) /* verify partition size must be >= blocksize */ if (part_size_g < blocksize_g) { fprintf(stderr, "Blocksize %d should not be bigger than partition size %d\n", blocksize_g, - part_size_g); + part_size_g); Hgoto_error(-1); } diff --git a/test/use_common.c b/test/use_common.c index 1dbd5d2..cb22b08 100644 --- a/test/use_common.c +++ b/test/use_common.c @@ -32,7 +32,7 @@ usage(const char *prog) fprintf(stderr, " -h, --help Print a usage message and exit\n"); fprintf(stderr, " -f FN Test file name [default: %s.h5]\n", prog); fprintf(stderr, - " -i N, --iteration=N Number of iterations to repeat the whole thing. [default: 1]\n"); + " -i N, --iteration=N Number of iterations to repeat the whole thing. [default: 1]\n"); fprintf(stderr, " -l w|r launch writer or reader only. [default: launch both]\n"); fprintf(stderr, " -n N, --nplanes=N Number of planes to write/read. [default: 1000]\n"); fprintf(stderr, " -s N, --swmr=N Use SWMR mode (0: no, non-0: yes) default is yes\n"); @@ -112,7 +112,7 @@ parse_option(int argc, char *const argv[], options_t *opts) case 'y': /* Number of planes per chunk */ if ((opts->chunkplanes = strtoul(optarg, NULL, 0)) <= 0) { fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", - optarg); + optarg); usage(opts->progname); Hgoto_error(-1); } @@ -158,9 +158,9 @@ show_parameters(options_t *opts) { printf("===Parameters used:===\n"); printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->chunkdims[0], - (unsigned long long)opts->chunkdims[1], (unsigned long long)opts->chunkdims[2]); + (unsigned long long)opts->chunkdims[1], (unsigned long long)opts->chunkdims[2]); printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->max_dims[0], - (unsigned long long)opts->max_dims[1], (unsigned long long)opts->max_dims[2]); + (unsigned long long)opts->max_dims[1], (unsigned long long)opts->max_dims[2]); printf("number of planes to write=%llu\n", (unsigned long long)opts->nplanes); printf("using SWMR mode=%s\n", opts->use_swmr ? "yes(1)" : "no(0)"); printf("data filename=%s\n", opts->filename); @@ -301,8 +301,8 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) /* verify chunk_dims against set parameters */ if (chunk_dims[0] != opts->chunkdims[0] || chunk_dims[1] != cz || chunk_dims[2] != cz) { fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n", - (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], - (unsigned long long)chunk_dims[2]); + (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], + (unsigned long long)chunk_dims[2]); return -1; } @@ -331,11 +331,11 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) return -1; } printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), - (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); + (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); /* verify that file space dims are as expected and are consistent with memory space dims */ if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]) { fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0], - (unsigned long long)dims[1], (unsigned long long)dims[2]); + (unsigned long long)dims[1], (unsigned long long)dims[2]); free(buffer); return -1; } @@ -508,13 +508,13 @@ read_uc_file(hbool_t towait, options_t *opts) return -1; } printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), - (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); + (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); /* verify that file space dims are as expected and are consistent with memory space dims */ if (dims[1] != memdims[1] || dims[2] != memdims[2]) { fprintf(stderr, "dataset dimension is not as expected. Got dims=(%llu,%llu,%llu)\n", - (unsigned long long)dims[0], (unsigned long long)dims[1], (unsigned long long)dims[2]); + (unsigned long long)dims[0], (unsigned long long)dims[1], (unsigned long long)dims[2]); fprintf(stderr, "But memdims=(%llu,%llu,%llu)\n", (unsigned long long)memdims[0], - (unsigned long long)memdims[1], (unsigned long long)memdims[2]); + (unsigned long long)memdims[1], (unsigned long long)memdims[2]); free(buffer); return -1; } @@ -541,7 +541,7 @@ read_uc_file(hbool_t towait, options_t *opts) loops_waiting_for_plane = 0; } printf("reading planes %llu to %llu\n", (unsigned long long)nplanes_seen, - (unsigned long long)dims[0]); + (unsigned long long)dims[0]); } else { if (loops_waiting_for_plane) { @@ -593,8 +593,8 @@ read_uc_file(hbool_t towait, options_t *opts) if ((hsize_t)*bufptr++ != nplane) { if (++nerrs < ErrorReportMax) { fprintf(stderr, "found error %llu plane(%llu,%llu), expected %llu, got %d\n", - (unsigned long long)nplane, (unsigned long long)j, - (unsigned long long)k, (unsigned long long)nplane, (int)*(bufptr - 1)); + (unsigned long long)nplane, (unsigned long long)j, (unsigned long long)k, + (unsigned long long)nplane, (int)*(bufptr - 1)); } /* end if should print error */ } /* end if value mismatch */ } /* end for plane second dimension */ @@ -602,7 +602,7 @@ read_uc_file(hbool_t towait, options_t *opts) if (nerrs) { nreadererr++; fprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs, - (unsigned long long)nplane); + (unsigned long long)nplane); } } /* end for each plane added since last read */ diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index 613c3b6..75f4a22 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -124,7 +124,7 @@ parse_option(int argc, char *const argv[]) case 'y': /* Number of planes per chunk */ if ((chunkplanes_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", - optarg); + optarg); usage(progname_g); Hgoto_error(-1); }; @@ -168,9 +168,9 @@ show_parameters(void) { printf("===Parameters used:===\n"); printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0], - (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]); + (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]); printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0], - (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]); + (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]); printf("number of planes to write=%llu\n", (unsigned long long)nplanes_g); printf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)"); printf("data filename=%s\n", filename_g); @@ -363,8 +363,8 @@ write_file(void) /* verify chunk_dims against set parameters */ if (chunk_dims[0] != chunkdims_g[0] || chunk_dims[1] != cz || chunk_dims[2] != cz) { fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n", - (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], - (unsigned long long)chunk_dims[2]); + (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], + (unsigned long long)chunk_dims[2]); return -1; } @@ -391,11 +391,11 @@ write_file(void) return -1; } printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), - (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); + (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); /* verify that file space dims are as expected and are consistent with memory space dims */ if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]) { fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0], - (unsigned long long)dims[1], (unsigned long long)dims[2]); + (unsigned long long)dims[1], (unsigned long long)dims[2]); return -1; } @@ -46,8 +46,8 @@ const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0", "vds_src_1", /* Print config directly to output */ #define PRINT_CONFIG(...) \ { \ - printf("Config: " __VA_ARGS__); \ - puts(""); \ + printf("Config: " __VA_ARGS__); \ + puts(""); \ } #else /* VDS_TEST_VERBOSE */ @@ -59,7 +59,7 @@ char vds_test_str_g[128] = ""; /* Replacement for TESTING_2 for non-verbose-output */ #define TESTING_2_SUPPRESSED(WHAT) \ { \ - snprintf(vds_test_str_g, sizeof(vds_test_str_g), WHAT); \ + snprintf(vds_test_str_g, sizeof(vds_test_str_g), WHAT); \ } /* Suppress output from PASSED() */ @@ -412,8 +412,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex if (config == TEST_API_REOPEN_FILE) { if (ninfo.meta_size.obj.heap_size != exp_meta_size) { printf("VDS metadata size: %llu Expected: %llu\n", - (long long unsigned)ninfo.meta_size.obj.heap_size, - (long long unsigned)exp_meta_size); + (long long unsigned)ninfo.meta_size.obj.heap_size, (long long unsigned)exp_meta_size); TEST_ERROR } } @@ -12346,8 +12345,8 @@ main(void) low_string = h5_get_version_string(low); high_string = h5_get_version_string(high); snprintf(msg, sizeof(msg), - "Testing virtual dataset I/O with file version bounds: (%s, %s):", low_string, - high_string); + "Testing virtual dataset I/O with file version bounds: (%s, %s):", low_string, + high_string); puts(msg); for (test_api_config = (int)TEST_API_BASIC; test_api_config < (int)TEST_API_NTESTS; diff --git a/test/vds_env.c b/test/vds_env.c index 25fe82a..c8b3fb4 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -347,14 +347,13 @@ main(void) low_string = h5_get_version_string(low); high_string = h5_get_version_string(high); snprintf(msg, sizeof(msg), - "Testing virtual dataset with file version bounds: (%s, %s):", low_string, - high_string); + "Testing virtual dataset with file version bounds: (%s, %s):", low_string, high_string); puts(msg); for (bit_config = 0; bit_config < TEST_IO_NTESTS; bit_config++) { printf("Config: %s%s%s\n", bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "", - bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file", - bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : ""); + bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file", + bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : ""); nerrors += test_vds_prefix_second(bit_config, fapl); } @@ -81,9 +81,9 @@ static int __k; #define HEXPRINT(size, buf) \ for (__k = 0; __k < (size); __k++) { \ if (__k % 16 == 0) { \ - printf("\n%04x", __k); \ + printf("\n%04x", __k); \ } \ - printf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \ + printf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \ } /* end #define HEXPRINT() */ /* Helper structure to pass around dataset information. @@ -2331,9 +2331,9 @@ error: { \ H5_FAILED(); \ AT(); \ - fprintf(stderr, mesg); \ + fprintf(stderr, mesg); \ H5Eprint2(H5E_DEFAULT, stderr); \ - fflush(stderr); \ + fflush(stderr); \ ret_value = -1; \ goto done; \ } |