Merge pull request #2367 in HDFFV/hdf5 from ~DYOUNG/werror:unused to develop

* commit '50aac126d7c4082c2aeb0f3a68cad26bd1cd9783':
  Start to document the function/parameter/variable attribute macros.
  Filter all of the new _USED / _UNUSED type modifiers.
  H5_HAVE_PARALLEL, _DEBUG_API, etc.  Add attributes to some variables and parameters that are unused under some configurations.

5 files changed, 9 insertions, 8 deletions

diff --git a/test/gen_new_super.c b/test/gen_new_super.c
index f6ce589..ed43a39 100644
--- a/test/gen_new_super.c
+++ b/test/gen_new_super.c
@@ -24,7 +24,7 @@
  */
 
 #include <assert.h>
-#include "hdf5.h"
+#include "testhdf5.h"
 
 #define TESTFILE   "tsupern.h5"
 #define ISTORE_IK  64
@@ -50,7 +50,7 @@ main(void)
 {
     hid_t       file;           /* File IDs for old & new files */
     hid_t       fcpl;           /* File creation property list */
-    herr_t      ret;            /* Generic return value */
+    herr_t      H5_ATTR_NDEBUG_UNUSED ret;
 
     /* Create a file creation property list */
     fcpl = H5Pcreate(H5P_FILE_CREATE);
diff --git a/test/gen_nullspace.c b/test/gen_nullspace.c
index 9d76deb..e4e75ac 100644
--- a/test/gen_nullspace.c
+++ b/test/gen_nullspace.c
@@ -24,8 +24,8 @@
  *      put into the 'test' directory in the 1.6.x branch of the library.
  */
 
-#include "hdf5.h"
 #include <assert.h>
+#include "testhdf5.h"
 
 #define NULLFILE   "tnullspace.h5"
 #define NULLDATASET  "null_dataset"
@@ -39,7 +39,7 @@ main(void)
     hid_t sid;          /* Dataspace ID */
     hid_t did;          /* Dataset ID */
     hid_t attr;         /* Attribute ID */
-    herr_t ret;         /* Generic return value */
+    herr_t H5_ATTR_NDEBUG_UNUSED ret;         /* Generic return value */
 
     /* Create the file */
     fid = H5Fcreate(NULLFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
diff --git a/test/gen_plist.c b/test/gen_plist.c
index 8f38b1a..8fc8a05 100644
--- a/test/gen_plist.c
+++ b/test/gen_plist.c
@@ -458,7 +458,7 @@ encode_plist(hid_t plist_id, int little_endian, int word_length, const char *fil
     herr_t ret = 0;
     void *temp_buf = NULL;
     size_t temp_size = 0;
-    ssize_t write_size;
+    ssize_t H5_ATTR_NDEBUG_UNUSED write_size;
     char filename[1024];
 
     /* Generate filename */
diff --git a/test/gen_specmetaread.c b/test/gen_specmetaread.c
index d06bd59..fd484d1 100644
--- a/test/gen_specmetaread.c
+++ b/test/gen_specmetaread.c
@@ -23,9 +23,10 @@
  *      the library on the trunk as of when this file is checked in.
  */
 
-#include "hdf5.h"
 #include <assert.h>
 
+#include "testhdf5.h"
+
 #define FILENAME        "specmetaread.h5"
 #define DIM             10
 
@@ -39,7 +40,7 @@ main(void)
     hsize_t     dim[1] = {DIM};
     unsigned    data[DIM];
     unsigned    u;
-    herr_t      ret;         /* Generic return value */
+    herr_t      H5_ATTR_NDEBUG_UNUSED ret;
 
     /* Initialize the data */
     for(u = 0; u < DIM; u++)
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c
index dd52232..f6bcd0d 100644
--- a/test/ttsafe_cancel.c
+++ b/test/ttsafe_cancel.c
@@ -61,7 +61,7 @@ tts_cancel(void)
     pthread_attr_t attribute;
     hid_t dataset;
     int buffer;
-    int ret;
+    int H5_ATTR_NDEBUG_UNUSED ret;
 
     /* make thread scheduling global */
     ret=pthread_attr_init(&attribute);