testpar/t_2Gio.c: Fix a typo that I think was introduced by a

        previous warnings PR.  An array element was assigned to
        itself---shape[2]Â =Â shape[2];---instead of being assigned to
        chunk[2].

fortran/src/H5Pf.c: move conditional compilation controlled by
        H5_NO_DEPRECATED_SYMBOLS outside of a function for readability.

fortran/src/H5match_types.c: put a variable's declaration under the same
        conditional compilation (H5_FORTRAN_HAVE_C_LONG_DOUBLE) as its
        use.

For now, skip compilation of some unused debug dump routines in the JNI.
While I'm in the JNI, delete a set-but-unused variable.

src/H5Z.c: condition a variable declaration on H5_NO_DEPRECATED_SYMBOLS
        so that it's not declared but unused or vice versa.

test/cache_common.h: add an #include in to get some symbols we need to
        avoid implicit declaration warnings.

test/dsets.c: use a more conventional conditional-compilation syntax.

test/dt_arith.c, test/fillval.c: initialize a bunch of uninitialized
        variables before use.

test/vfd.c: pass the expected type of `void **` to posix_memalign(3)
        instead of `int **`.

testpar/t_bigio.c: explicitly compare with 0 instead of using ! when
        "equal to 0?" is the question not "is false?"  Repair some
        indentation while I'm here.

testpar/testpar.h: repair misaligned line-continuation backslashes in a
        macro that probably should be a function so that we don't have
        to fiddle with the line continuation to begin with.

tools/src/h5repack/h5repack_main.c: fix some compiler fussing about
        enums.

tools/test/perform/pio_engine.c: the compiler fusses if you cast a
        function call returning double directly to off_t.  It's ok if
        you cast a variable that's a double to off_t, however.  Write
        and use a new function, sqrto(), to avoid the cast warnings.

1 files changed, 8 insertions, 2 deletions

diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 55f7571..f45902f 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -28,6 +28,8 @@ extern "C" {
 #include "hdf5.h"
 #include "h5util.h"
 
+#define SKIP_UNUSED_DUMP_ROUTINES
+
 /* size of hyperslab buffer when a dataset is bigger than H5TOOLS_MALLOCSIZE */
 hsize_t H5TOOLS_BUFSIZE = (32 * 1024 * 1024);  /* 32 MB */
 int     H5TOOLS_TEXT_BLOCK = 16;  /* Number of elements on a line in a text export file */
@@ -52,8 +54,10 @@ void        *edata;
 /* Local Prototypes */
 /********************/
 
+#ifndef SKIP_UNUSED_DUMP_ROUTINES
 static int     h5str_dump_region_blocks(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
 static int     h5str_dump_region_points(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
+#endif
 static int     h5str_is_zero(const void *_mem, size_t size);
 static hid_t   h5str_get_native_type(hid_t type);
 static hid_t   h5str_get_little_endian_type(hid_t type);
@@ -708,7 +712,6 @@ h5str_sprintf
     unsigned char *ucptr = (unsigned char *) in_buf;
     static char    fmt_llong[8], fmt_ullong[8];
     H5T_class_t    tclass = H5T_NO_CLASS;
-    H5T_str_t      pad;
     size_t         typeSize = 0;
     H5T_sign_t     nsign = H5T_SGN_ERROR;
     hid_t          mtid = H5I_INVALID_HID;
@@ -814,7 +817,6 @@ h5str_sprintf
             else {
                 tmp_str = cptr;
             }
-            pad = H5Tget_strpad(tid);
 
             /* Check for NULL pointer for string */
             if (!tmp_str) {
@@ -1482,6 +1484,7 @@ done:
     return ret_value;
 } /* end h5str_dump_region_blocks_data */
 
+#ifndef SKIP_UNUSED_DUMP_ROUTINES
 static int
 h5str_dump_region_blocks
     (JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
@@ -1569,6 +1572,7 @@ done:
 
     return ret_value;
 } /* end h5str_dump_region_blocks */
+#endif
 
 /*-------------------------------------------------------------------------
  * Purpose: Print the data values from a dataset referenced by region points.
@@ -1701,6 +1705,7 @@ done:
     return ret_value;
 } /* end h5str_dump_region_points_data */
 
+#ifndef SKIP_UNUSED_DUMP_ROUTINES
 static int
 h5str_dump_region_points
     (JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
@@ -1776,6 +1781,7 @@ done:
 
     return ret_value;
 } /* end h5str_dump_region_points */
+#endif
 
 static int
 h5str_is_zero