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.

3 files changed, 29 insertions, 30 deletions

diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index 77a5d18..8fdca35 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -26,9 +26,8 @@ extern "C" {
 #include <stdlib.h>
 #include "h5jni.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
+H5_GCC_DIAG_OFF(missing-prototypes)
+H5_GCC_DIAG_OFF(unused-parameter)
 
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5_1QUARTER_1HADDR_1MAX(JNIEnv *env, jclass cls) { return (hsize_t)HADDR_MAX/4; }
@@ -366,8 +365,7 @@ JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1CANCELED(JNIEnv *env, jclass cls) { return H5ES_STATUS_CANCELED; }
 
 /* Java does not have unsigned native types */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
+H5_GCC_DIAG_OFF(sign-conversion)
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1CREAT(JNIEnv *env, jclass cls) { return H5F_ACC_CREAT; }
 JNIEXPORT jint JNICALL
@@ -384,7 +382,7 @@ JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1SWMR_1READ(JNIEnv *env, jclass cls) { return H5F_ACC_SWMR_READ; }
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1SWMR_1WRITE(JNIEnv *env, jclass cls) { return H5F_ACC_SWMR_WRITE; }
-#pragma GCC diagnostic pop
+H5_GCC_DIAG_ON(sign-conversion)
 
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1DEFAULT(JNIEnv *env, jclass cls) { return H5F_CLOSE_DEFAULT; }
@@ -1412,7 +1410,8 @@ Java_hdf_hdf5lib_HDF5Constants_H5Z_1SCALEOFFSET_1USER_1NPARMS(JNIEnv *env, jclas
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1ALL(JNIEnv *env, jclass cls) { return H5Z_FILTER_ALL; }
 
-#pragma GCC diagnostic pop
+H5_GCC_DIAG_ON(missing-prototypes)
+H5_GCC_DIAG_ON(unused-parameter)
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pDCPLImp.c b/java/src/jni/h5pDCPLImp.c
index c43079f..f5bbcb1 100644
--- a/java/src/jni/h5pDCPLImp.c
+++ b/java/src/jni/h5pDCPLImp.c
@@ -1237,7 +1237,7 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong index)
+    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
     ssize_t  buf_size;
     char    *dname = NULL;
@@ -1246,13 +1246,13 @@ Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname
     UNUSED(clss);
 
     /* get the length of the filename */
-    if ((buf_size = H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t)index, NULL, 0)) < 0)
+    if ((buf_size = H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t) idx, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL == (dname = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_dsetname: memory allocation failed");
 
-    if (H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t)index, dname, (size_t)buf_size + 1) < 0)
+    if (H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t) idx, dname, (size_t)buf_size + 1) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     dname[buf_size] = '\0';
 
@@ -1275,7 +1275,7 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong index)
+    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
     ssize_t  buf_size;
     char    *fname = NULL;
@@ -1284,13 +1284,13 @@ Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename
     UNUSED(clss);
 
     /* get the length of the filename */
-    if ((buf_size = H5Pget_virtual_filename((hid_t)dcpl_id, (size_t)index, NULL, 0)) < 0)
+    if ((buf_size = H5Pget_virtual_filename((hid_t)dcpl_id, (size_t) idx, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL == (fname = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_filename: memory allocation failed");
 
-    if (H5Pget_virtual_filename((hid_t)dcpl_id, (size_t)index, fname, (size_t)buf_size + 1) < 0)
+    if (H5Pget_virtual_filename((hid_t)dcpl_id, (size_t) idx, fname, (size_t)buf_size + 1) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     fname[buf_size] = '\0';
 
@@ -1313,13 +1313,13 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Pget_1virtual_1srcspace
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong index)
+    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
     hid_t space_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((space_id = H5Pget_virtual_srcspace((hid_t)dcpl_id, (size_t)index)) < 0)
+    if ((space_id = H5Pget_virtual_srcspace((hid_t)dcpl_id, (size_t) idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1333,13 +1333,13 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Pget_1virtual_1vspace
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong index)
+    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
     hid_t space_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((space_id = H5Pget_virtual_vspace((hid_t)dcpl_id, (size_t)index)) < 0)
+    if ((space_id = H5Pget_virtual_vspace((hid_t)dcpl_id, (size_t) idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c
index b43b532..ce42842 100644
--- a/java/src/jni/h5plImp.c
+++ b/java/src/jni/h5plImp.c
@@ -129,7 +129,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLreplace
-  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint index)
+  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint idx)
 {
     const char *newPath = NULL;
     herr_t      retVal = FAIL;
@@ -139,12 +139,12 @@ Java_hdf_hdf5lib_H5_H5PLreplace
     if (NULL == plugin_path)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5PLreplace: new path is NULL");
 
-    if (index < 0)
+    if (idx < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5PLreplace: index < 0");
 
     PIN_JAVA_STRING(ENVONLY, plugin_path, newPath, NULL, "H5PLreplace: new path not pinned");
 
-    if ((retVal = H5PLreplace(newPath, (unsigned) index)) < 0)
+    if ((retVal = H5PLreplace(newPath, (unsigned) idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -159,7 +159,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLinsert
-  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint index)
+  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint idx)
 {
     const char *newPath = NULL;
     herr_t      retVal = FAIL;
@@ -169,12 +169,12 @@ Java_hdf_hdf5lib_H5_H5PLinsert
     if (NULL == plugin_path)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5PLinsert: new path is NULL");
 
-    if (index < 0)
+    if (idx < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5PLinsert: index < 0");
 
     PIN_JAVA_STRING(ENVONLY, plugin_path, newPath, NULL, "H5PLinsert: new path not pinned");
 
-    if ((retVal = H5PLinsert(newPath, (unsigned) index)) < 0)
+    if ((retVal = H5PLinsert(newPath, (unsigned) idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -189,14 +189,14 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLremove
-  (JNIEnv *env, jclass clss, jint index)
+  (JNIEnv *env, jclass clss, jint idx)
 {
     UNUSED(clss);
 
-    if (index < 0)
+    if (idx < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5PLremove: index < 0");
 
-    if (H5PLremove((unsigned) index) < 0)
+    if (H5PLremove((unsigned) idx) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -210,7 +210,7 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5PLget
-  (JNIEnv *env, jclass clss, jint index)
+  (JNIEnv *env, jclass clss, jint idx)
 {
     jstring  str = NULL;
     ssize_t  buf_size;
@@ -218,17 +218,17 @@ Java_hdf_hdf5lib_H5_H5PLget
 
     UNUSED(clss);
 
-    if (index < 0)
+    if (idx < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5PLget: index < 0");
 
     /* Get the length of the name */
-    if ((buf_size = H5PLget((unsigned) index, NULL, 0)) < 0)
+    if ((buf_size = H5PLget((unsigned) idx, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL == (aName = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5PLget: failed to allocate plugin name buffer");
 
-    if ((H5PLget((unsigned) index, aName, (size_t)buf_size + 1)) < 0)
+    if ((H5PLget((unsigned) idx, aName, (size_t)buf_size + 1)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     aName[buf_size] = '\0';