Squashed commit of the following:

commit 8053ec8beda3e373fbae6334412233290a3d7f0c
Author: David Young <dyoung@hdfgroup.org>
Date:   Fri Jan 31 13:53:26 2020 -0600

    Squashed commit of the following:

    commit ff7a9a34de2fcd78f5d32a1532f3d0e224b20d94
    Author: Kimmy Mu <kmu@hdfgroup.org>
    Date:   Wed Jan 29 14:12:18 2020 -0600

        Merge pull request #2324 in HDFFV/hdf5 from ~KMU/hdf5:hdf5_1_12 to hdf5_1_12

        * commit '781fa57f6ee816e037dd12fff02d37ff7ec9c2b1':
          pick up missing piece from merge
          Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
          remove redundent definition
          Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
          Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
          Merge pull request #2315 in HDFFV/hdf5 from ~KMU/hdf5:develop to develop
          missing prototype warning
          prototype issue
          Merge pull request #2306 in HDFFV/hdf5 from ~KMU/hdf5:develop to develop
          Merge pull request #2300 in HDFFV/hdf5 from ~KMU/hdf5:squashed_cast to develop
          Merge pull request #2291 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/uninitialized to develop
          Merge pull request #2295 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/float to develop
          Merge pull request #2292 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/prototype to develop
          Merge pull request #2094 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/unused to develop

    commit 9f3d808c05d2a3b308f32c958c6671fcac0a432c
    Author: David Young <dyoung@hdfgroup.org>
    Date:   Wed Jan 29 11:43:55 2020 -0600

        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.

    commit 43a4b80b21c0329fbc1f9a0e2854795189f0bb50
    Author: David Young <dyoung@hdfgroup.org>
    Date:   Wed Jan 29 10:47:30 2020 -0600

        Reduce casts of HDcalloc()/HDmalloc() that -Wc++-compat required.

        Reduce gratuitous casts---e.g., (size_t)1.

        Use the right format string for a pointer.

        In the H5C sanity checks, change a "size increase" variable from ssize_t
        (too narrow) to int64_t (wide enough).

        Parenthesize every appearance of `storage` in the macro
        `H5D_CHUNK_STORAGE_INDEX_CHK(storage)` so that you can pass in an
        expression like &sc and it works properly.

        Disallow re-assignment of the `dset` parameter to H5D__chunk_init()
        because it helped assure me that it's safe to replace the repeating
        expression `&dset->shared->layout.storage.u.chunk` with `sc` throughout.

        Replace lengthy expressions such as
        `&dset->shared->layout.storage.u.chunk` with `sc` throughout several
        functions in H5Dchunk.c ISTR that the compiler warned that `sc` was
        declared but unused in a couple of functions, and then I found that `sc`
        could be used in many places.  Maybe the disused `sc` appeared because a
        bunch of code was copied and pasted, I don't know.  Anyway, it's a lot
        tighter code now that I use `sc`.

        In H5D__chunk_update_old_edge_chunks() and H5D__chunk_delete()
        I actually expand `sc` and another temporary variable, `pline`,
        because they're used only in !defined(NDEBUG) code.  This squashes
        unused-variable warnings in the defined(NDEBUG) configuration.

        Don't drop the `volatile` qualification with a cast in
        tools/src/h5import/h5import.c.

    commit 035bfa0769a4012881fc659b673bacf44d146537
    Author: David Young <dyoung@hdfgroup.org>
    Date:   Tue Jan 28 20:35:28 2020 -0600

        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.

commit 098473fe89a4d02c440c44367bd1975fb184f84f
Author: kmu <kmu@hdfgroup.org>
Date:   Wed Jan 29 13:01:30 2020 -0600

    pick up missing piece from merge

commit 440821f48131e31f6232d281f7291f5db05b694e
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Tue Jan 28 13:28:26 2020 -0600

    Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop

    * commit '406330addf45529ecdd088f4d22e9aab9a03661d':
      rename macro
      change condition
      pick up from Dave's fix
      leave Wswitch-default for later fix
      fix Wredundant-decls, Wswitch-default, Wdeclaration-after-statement, Wsign-compare, Wmisleading-indentation, Wshadow

commit ae58f0a8624be34eb203dafefad34fba27e04085
Author: kmu <kmu@hdfgroup.org>
Date:   Tue Jan 28 16:01:52 2020 -0600

    remove redundent definition

commit 77ef44518d9ad4d0801dae864c167830a91a5e42
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Tue Jan 28 13:28:26 2020 -0600

    Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop

    * commit '406330addf45529ecdd088f4d22e9aab9a03661d':
      rename macro
      change condition
      pick up from Dave's fix
      leave Wswitch-default for later fix
      fix Wredundant-decls, Wswitch-default, Wdeclaration-after-statement, Wsign-compare, Wmisleading-indentation, Wshadow

commit 87fd1c55cbea948808a9fc0f149ecc180d0e7d8e
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Tue Jan 28 13:28:26 2020 -0600

    Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop

    * commit '406330addf45529ecdd088f4d22e9aab9a03661d':
      rename macro
      change condition
      pick up from Dave's fix
      leave Wswitch-default for later fix
      fix Wredundant-decls, Wswitch-default, Wdeclaration-after-statement, Wsign-compare, Wmisleading-indentation, Wshadow

commit a5cd1c9242bb861796ac884c72df1c0ca2f53d30
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Tue Jan 28 13:25:09 2020 -0600

    Merge pull request #2315 in HDFFV/hdf5 from ~KMU/hdf5:develop to develop

    * commit '3177c89c5b0749ef1294ec60e124bf402246feba':
      fix issues from test fail

commit f1045af1cd993e3c994347cb538e2644a13cf5d5
Author: kmu <kmu@hdfgroup.org>
Date:   Tue Jan 28 14:37:46 2020 -0600

    missing prototype warning

commit e37d04d6e0dba9b2150f1f4b387c4a79bb55435b
Author: kmu <kmu@hdfgroup.org>
Date:   Mon Jan 27 21:15:19 2020 -0600

    prototype issue

commit 7bc3ea666d7353d16c1223aee42a8f6cd92ae97d
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Fri Jan 24 12:31:45 2020 -0600

    Merge pull request #2306 in HDFFV/hdf5 from ~KMU/hdf5:develop to develop

    * commit 'a152ffafb322551033adb594112f53836f7eb240':
      fix assert fail

commit 243e4f698ae28feaa839161f2105bef96c9e1d19
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Thu Jan 23 16:21:06 2020 -0600

    Merge pull request #2300 in HDFFV/hdf5 from ~KMU/hdf5:squashed_cast to develop

    * commit 'af5c33afabdae2e39bb45eb1b3e9c8366da01145':
      remove unnecessary stuff
      squash cast warning fix

commit 75e1e874be76c4596d0d1a87bcc7810f06e9bcfe
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Wed Jan 22 21:34:17 2020 -0600

    Merge pull request #2291 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/uninitialized to develop

    * commit '2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8':
      fix uninitizlized warning

commit 88d5830bd279cf52de55501f99069071ec683ab9
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Wed Jan 22 20:59:49 2020 -0600

    Merge pull request #2295 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/float to develop

    * commit '9afaf94bef740f89958a1a8aae369d5f607845f4':
      not use hdf5 private header
      fix float type cmp warning
      fix float type cmp warning

commit ff365b1aebe6fc33d881f71c2ea26493a99c5da3
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Wed Jan 22 20:58:42 2020 -0600

    Merge pull request #2292 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/prototype to develop

    * commit '9f80ffa1f1908975b3100814b2529bf779521e13':
      fix missing prototype warning

commit 3d359a8dedbbf6ddeca36ff3f60c5f928691c214
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Wed Jan 22 19:46:53 2020 -0600

    Merge pull request #2094 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/unused to develop

    * commit '145ef3ceee20c28a443bd11507c58858bea3f889':
      more cleanup
      change it back
      pick up missing piece
      fix unused related warnings
      removed unused parameter
      more fix and address comments
      remove unsed var,function,macro, etc

commit a8442266bd27cc32374bc66d48634e8edacfcb65
Author: Kimmy Mu <kmu@hdfgroup.org>
Date:   Wed Jan 22 19:46:53 2020 -0600

    Merge pull request #2094 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/unused to develop

    * commit '145ef3ceee20c28a443bd11507c58858bea3f889':
      more cleanup
      change it back
      pick up missing piece
      fix unused related warnings
      removed unused parameter
      more fix and address comments
      remove unsed var,function,macro, etc

2 files changed, 21 insertions, 14 deletions

diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 9fdd19b..2cacc8c 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -488,12 +488,26 @@ h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
  *  Removed extra length parameters EP 7/6/00
  * SOURCE
 */
+#ifdef H5_NO_DEPRECATED_SYMBOLS
+int_f
+h5pget_version_c (hid_t_f H5_ATTR_UNUSED *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr)
+/******/
+{
+     /*
+      * Fill in fake values [since we need a file ID to call H5Fget_info :-( -QAK ]
+      */
+     *boot = (int_f)0;
+     *freelist = (int_f)0;
+     *stab = (int_f)0;
+     *shhdr = (int_f)0;
+
+     return 0;
+}
+#else /* H5_NO_DEPRECATED_SYMBOLS */
 int_f
 h5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr)
 /******/
 {
-     int ret_value = -1;
-#ifndef H5_NO_DEPRECATED_SYMBOLS
      herr_t ret;
      unsigned c_boot;
      unsigned c_freelist;
@@ -504,25 +518,16 @@ h5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab,
       * Call H5Pget_version function.
       */
      ret = H5Pget_version((hid_t)*prp_id, &c_boot, &c_freelist, &c_stab, &c_shhdr);
-     if (ret < 0) return ret_value;
+     if (ret < 0) return -1;
 
      *boot = (int_f)c_boot;
      *freelist = (int_f)c_freelist;
      *stab = (int_f)c_stab;
      *shhdr = (int_f)c_shhdr;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
-     /*
-      * Fill in fake values [since we need a file ID to call H5Fget_info :-( -QAK ]
-      */
-     *boot = (int_f)0;
-     *freelist = (int_f)0;
-     *stab = (int_f)0;
-     *shhdr = (int_f)0;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-     ret_value = 0;
 
-     return ret_value;
+     return 0;
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /****if* H5Pf/h5pget_userblock_c
  * NAME
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 2a6204d..ec2d66f 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -153,7 +153,9 @@ int main(void)
   
   int FORTRAN_NUM_INTEGER_KINDS=H5_FORTRAN_NUM_INTEGER_KINDS;
   int H5_FORTRAN_NUM_REAL_KINDS;
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE!=0
   int found_long_double = 0;
+#endif
 
   /* Open target files */
   c_header = fopen(CFILE, "w");