summaryrefslogtreecommitdiffstats
path: root/test/error_test.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-08-05 12:32:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-08-05 12:32:01 (GMT)
commit59a8b10b881b33a9d47243c16600be18e697a68c (patch)
tree73937c6bcc8773661945b606ca3d648cb8b54808 /test/error_test.c
parent42bd90edc82445a9758937a5149874b79266a733 (diff)
downloadhdf5-59a8b10b881b33a9d47243c16600be18e697a68c.zip
hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.tar.gz
hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.tar.bz2
Merge fixes and code reconciliation wit develop
Diffstat (limited to 'test/error_test.c')
-rw-r--r--test/error_test.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/error_test.c b/test/error_test.c
index 580234a..1de9065 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -320,6 +320,14 @@ long_desc_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *clie
*
*-------------------------------------------------------------------------
*/
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ * This pragma only needs to surround the snprintf() calls with
+ * '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"
static herr_t
test_long_desc(void)
{
@@ -374,6 +382,7 @@ error:
return -1;
} /* end test_long_desc() */
+#pragma GCC diagnostic pop
/*-------------------------------------------------------------------------