From b8ce64f383197858619115fa2cab7d1901ff441f Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Wed, 1 Nov 2023 19:49:07 -0600
Subject: [PATCH] test3

---
 libnczarr/zformat1.c |  9 ++++++++-
 libnczarr/zformat2.c |  9 ++++++++-
 libnczarr/zformat3.c | 10 ++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/libnczarr/zformat1.c b/libnczarr/zformat1.c
index a7f3c06a92..73ca80aef7 100644
--- a/libnczarr/zformat1.c
+++ b/libnczarr/zformat1.c
@@ -327,13 +327,13 @@ read_vars(NC_FILE_INFO_T* file, NCZ_FILE_INFO_T* zfile, NCZMAP* map, NC_GRP_INFO
 	const char* varname = NULL;
         size64_t* shapes = NULL;
         NClist* dimnames = NULL;
-        int varsized = 0;
         int suppress = 0; /* Abort processing of this variable */
         nc_type vtype = NC_NAT;
         int vtypelen = 0;
         int rank = 0;
         int zarr_rank = 0; /* Need to watch out for scalars */
 #ifdef ENABLE_NCZARR_FILTERS
+        int varsized = 0;
         NCjson* jfilter = NULL;
         int chainindex = 0;
 #endif
@@ -1630,6 +1630,7 @@ NCZ_createdim(NC_FILE_INFO_T* file, const char* name, size64_t dimlen, NC_DIM_IN
 
 /* JSON Parse/unparse of filter codecs */
 
+#ifdef ENABLE_NCZARR_FILTERS
 int
 ZF1_hdf2codec(const NC_FILE_INFO_T* file, const NC_VAR_INFO_T* var, NCZ_Filter* filter)
 {
@@ -1689,6 +1690,7 @@ ZF1_codec2hdf(const NC_FILE_INFO_T* file, const NC_VAR_INFO_T* var, const NCjson
 done:
     return THROW(stat);
 }
+#endif /*ENABLE_NCZARR_FILTERS*/
 
 /**************************************************/
 /* Format Dispatch table */
@@ -1703,8 +1705,13 @@ static const NCZ_Formatter NCZ_formatter1_table = {
     ZF1_readmeta,
     ZF1_writemeta,
     ZF1_readattrs,
+#ifdef ENABLE_NCZARR_FILTERS
     ZF1_codec2hdf,
     ZF1_hdf2codec,
+#else
+    NULL,
+    NULL,
+#endif
     ZF1_close
 };
 
diff --git a/libnczarr/zformat2.c b/libnczarr/zformat2.c
index 6be2fec3f4..a48916dbe2 100644
--- a/libnczarr/zformat2.c
+++ b/libnczarr/zformat2.c
@@ -1140,13 +1140,13 @@ read_vars(NC_FILE_INFO_T* file, NCZ_FILE_INFO_T* zfile, NCZMAP* map, NC_GRP_INFO
 	const char* varname = NULL;
         size64_t* shapes = NULL;
         NClist* dimnames = NULL;
-        int varsized = 0;
         int suppress = 0; /* Abort processing of this variable */
         nc_type vtype = NC_NAT;
         int vtypelen = 0;
         int rank = 0;
         int zarr_rank = 0; /* Need to watch out for scalars */
 #ifdef ENABLE_NCZARR_FILTERS
+        int varsized = 0;
         NCjson* jfilter = NULL;
         int chainindex = 0;
 #endif
@@ -2334,6 +2334,7 @@ NCZ_createdim(NC_FILE_INFO_T* file, const char* name, size64_t dimlen, NC_DIM_IN
 
 /* JSON Parse/unparse of filter codecs */
 
+#ifdef ENABLE_NCZARR_FILTERS
 int
 ZF2_hdf2codec(const NC_FILE_INFO_T* file, const NC_VAR_INFO_T* var, NCZ_Filter* filter)
 {
@@ -2398,6 +2399,7 @@ ZF2_codec2hdf(const NC_FILE_INFO_T* file, const NC_VAR_INFO_T* var, const NCjson
 done:
     return THROW(stat);
 }
+#endif /*ENABLE_NCZARR_FILTERS*/
 
 /**************************************************/
 /* Format Dispatch table */
@@ -2412,8 +2414,13 @@ static const NCZ_Formatter NCZ_formatter2_table = {
     ZF2_readmeta,
     ZF2_writemeta,
     ZF2_readattrs,
+#ifdef ENABLE_NCZARR_FILTERS
     ZF2_codec2hdf,
     ZF2_hdf2codec,
+#else
+    NULL,
+    NULL,
+#endif
     ZF2_close
 };
 
diff --git a/libnczarr/zformat3.c b/libnczarr/zformat3.c
index b84eae8a54..91b246b9e6 100644
--- a/libnczarr/zformat3.c
+++ b/libnczarr/zformat3.c
@@ -954,13 +954,13 @@ read_vars(NC_FILE_INFO_T* file, NCZ_FILE_INFO_T* zfile, NCZMAP* map, NC_GRP_INFO
 	const char* varname = NULL;
         size64_t* shapes = NULL;
         NClist* dimnames = NULL;
-        int varsized = 0;
         int suppress = 0; /* Abort processing of this variable */
         nc_type vtype = NC_NAT;
         int vtypelen = 0;
         int rank = 0;
         int zarr_rank = 0; /* Need to watch out for scalars */
 #ifdef ENABLE_NCZARR_FILTERS
+        int varsized = 0;
         NCjson* jfilter = NULL;
         int chainindex = 0;
 #endif
@@ -2109,6 +2109,7 @@ NCZ_createdim(NC_FILE_INFO_T* file, const char* name, size64_t dimlen, NC_DIM_IN
 
 /* JSON Parse/unparse of filter codecs */
 
+#ifdef ENABLE_NCZARR_FILTERS
 int
 ZF3_hdf2codec(const NC_FILE_INFO_T* file, const NC_VAR_INFO_T* var, NCZ_Filter* filter)
 {
@@ -2168,7 +2169,7 @@ ZF3_codec2hdf(const NC_FILE_INFO_T* file, const NC_VAR_INFO_T* var, const NCjson
 done:
     return THROW(stat);
 }
-
+#endif /*ENABLE_NCZARR_FILTERS*/
 /**************************************************/
 /* Format Dispatch table */
 
@@ -2182,8 +2183,13 @@ static const NCZ_Formatter NCZ_formatter3_table = {
     ZF3_readmeta,
     ZF3_writemeta,
     ZF3_readattrs,
+#ifdef ENABLE_NCZARR_FILTERS
     ZF3_codec2hdf,
     ZF3_hdf2codec,
+#else
+    NULL,
+    NULL,
+#endif
     ZF3_close
 };