From 08b797de73f0ff2ed8bfa3904b42064b26373e96 Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Mon, 18 Jul 2022 07:35:21 -0700
Subject: Fixes warnings when the deflate filter is not built (#1904)

* Fixes warnings when the deflate filter is not built

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 test/filter_plugin.c              |  4 +++-
 tools/test/h5diff/h5diffgentest.c |  4 +++-
 tools/test/h5repack/h5repacktst.c | 12 ++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index 4dcf74a..1454156 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -438,9 +438,11 @@ static herr_t
 test_dataset_write_with_filters(hid_t fid)
 {
     hid_t        dcpl_id = -1;     /* Dataset creation property list ID        */
-    unsigned int compress_level;   /* Deflate compression level                */
     unsigned int filter1_data;     /* Data used by filter 1                    */
     unsigned int libver_values[4]; /* Used w/ the filter that makes HDF5 calls */
+#ifdef H5_HAVE_FILTER_DEFLATE
+    unsigned int compress_level; /* Deflate compression level */
+#endif
 
     /*----------------------------------------------------------
      * STEP 1: Test deflation by itself.
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 5e0f830..66d9f42 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -2059,7 +2059,6 @@ gen_dataset_idx(const char *file, int format)
 {
     hid_t   fid       = H5I_INVALID_HID; /* file id */
     hid_t   did       = H5I_INVALID_HID;
-    hid_t   did2      = H5I_INVALID_HID; /* dataset id */
     hid_t   sid       = H5I_INVALID_HID; /* space id */
     hid_t   fapl      = H5I_INVALID_HID; /* file access property id */
     hid_t   dcpl      = H5I_INVALID_HID; /* dataset creation property id */
@@ -2068,6 +2067,9 @@ gen_dataset_idx(const char *file, int format)
     herr_t  status;                      /* return status */
     int     buf[10];                     /* data buffer */
     int     i;                           /* local index variable */
+#if defined(H5_HAVE_FILTER_DEFLATE)
+    hid_t did2 = H5I_INVALID_HID; /* dataset id */
+#endif
 
     /* Get a copy of the file aaccess property */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 028939a..b89a501 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -2526,12 +2526,16 @@ error:
 static int
 make_deflate(hid_t loc_id)
 {
-    hid_t      dcpl             = H5I_INVALID_HID; /* dataset creation property list */
-    hid_t      sid              = H5I_INVALID_HID; /* dataspace ID */
-    hsize_t    dims[RANK]       = {DIM1, DIM2};
-    hsize_t    chunk_dims[RANK] = {CDIM1, CDIM2};
+    hid_t   dcpl             = H5I_INVALID_HID; /* dataset creation property list */
+    hid_t   sid              = H5I_INVALID_HID; /* dataspace ID */
+    hsize_t dims[RANK]       = {DIM1, DIM2};
+    hsize_t chunk_dims[RANK] = {CDIM1, CDIM2};
+#if defined(H5_HAVE_FILTER_DEFLATE)
     hobj_ref_t bufref[1]; /* reference */
     hsize_t    dims1r[1] = {1};
+#else
+    (void)loc_id;
+#endif
 
     /* Create and fill array */
     struct {
-- 
cgit v0.12