summaryrefslogtreecommitdiffstats
path: root/test/error_test.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 02:35:28 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-29 02:35:28 (GMT)
commitfa1b2f6ef35c459c9f74ead885c119ae7f61c056 (patch)
treea71219e0f97dfd57e2c1a8a2e89b65476631ba0b /test/error_test.c
parent71c050f837149a0c11e0936e661047c091deaa2f (diff)
downloadhdf5-fa1b2f6ef35c459c9f74ead885c119ae7f61c056.zip
hdf5-fa1b2f6ef35c459c9f74ead885c119ae7f61c056.tar.gz
hdf5-fa1b2f6ef35c459c9f74ead885c119ae7f61c056.tar.bz2
Reduce differences between my -Werror branch and `develop`:
Rename index -> idx, fileno -> fnumber, fileno -> fno to avoid GCC shadowed declaration warnings about index(3). Convert #pragma GCC diagnostic push/pop/ignored to the HDF5 library's H5_GCC_DIAG_OFF()/H5_GCC_DIAG_ON() macros.
Diffstat (limited to 'test/error_test.c')
-rw-r--r--test/error_test.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/error_test.c b/test/error_test.c
index e99a82f..7c6cf9f 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -329,8 +329,7 @@ long_desc_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *clie
* 'full_desc' in the code below, but early (4.4.7, at least) gcc only
* allows diagnostic pragmas to be toggled outside of functions.
*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+H5_GCC_DIAG_OFF(format-nonliteral)
static herr_t
test_long_desc(void)
{
@@ -385,7 +384,7 @@ error:
return -1;
} /* end test_long_desc() */
-#pragma GCC diagnostic pop
+H5_GCC_DIAG_ON(format-nonliteral)
/*-------------------------------------------------------------------------