diff options
Diffstat (limited to 'test/gheap.c')
| -rw-r--r-- | test/gheap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/gheap.c b/test/gheap.c index 6b02c98..714ba27 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -34,17 +34,17 @@ #define GHEAP_TEST_NOBJS 1024 #define GHEAP_REPEATED_ERR(MSG) \ - { \ + do { \ nerrors++; \ if (nerrors <= GHEAP_REPEATED_ERR_LIM) { \ H5_FAILED(); \ HDputs(MSG); \ if (nerrors == GHEAP_REPEATED_ERR_LIM) \ HDputs(" Suppressing further errors..."); \ - } /* end if */ \ - } /* end GHEAP_REPEATED_ERR */ + } /* end if */ \ + } while (0) /* end GHEAP_REPEATED_ERR */ -const char *FILENAME[] = {"gheap1", "gheap2", "gheap3", "gheap4", "gheapooo", NULL}; +static const char *FILENAME[] = {"gheap1", "gheap2", "gheap3", "gheap4", "gheapooo", NULL}; /*------------------------------------------------------------------------- * Function: test_1 @@ -146,7 +146,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) free(obj); return MAX(1, nerrors); @@ -243,7 +243,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) free(obj); return MAX(1, nerrors); @@ -330,7 +330,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) free(obj); return MAX(1, nerrors); @@ -423,7 +423,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) free(obj); return MAX(1, nerrors); @@ -481,7 +481,7 @@ test_ooo_indices(hid_t fapl) H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, sizeof(j), &j, &obj[j]); if (status < 0) - GHEAP_REPEATED_ERR(" Unable to insert object into global heap") + GHEAP_REPEATED_ERR(" Unable to insert object into global heap"); /* Check that the index is as expected */ if (obj[j].idx != ((1000 * i) + j - (1000 * ((~i & 1)))) % ((1U << 16) - 1) + 1) @@ -539,7 +539,7 @@ error: { H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY if (obj) free(obj); return MAX(1, nerrors); @@ -597,7 +597,7 @@ error: { H5Pclose(fapl_id); } - H5E_END_TRY; + H5E_END_TRY if (api_ctx_pushed) H5CX_pop(FALSE); |