From 6a628b9ca7b8c027d6d6dd0327ab41597f0b0447 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 12 Dec 2023 16:49:13 -0700
Subject: [PATCH] Rebased PR by hand against main.

---
 libnczarr/zvar.c                | 3 ++-
 nc_test4/tst_virtual_datasets.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libnczarr/zvar.c b/libnczarr/zvar.c
index df06d9dfb..607a35185 100644
--- a/libnczarr/zvar.c
+++ b/libnczarr/zvar.c
@@ -1703,6 +1703,7 @@ NCZ_put_vars(int ncid, int varid, const size_t *startp, const size_t *countp,
        do no harm to reextend it to that size. */
     if (var->ndims)
     {
+
 	for (d2 = 0; d2 < var->ndims; d2++)
 	{
 	    size64_t endindex = start[d2] + stride[d2] * (count[d2] - 1); /* last index written */
@@ -1727,7 +1728,7 @@ NCZ_put_vars(int ncid, int varid, const size_t *startp, const size_t *countp,
 	    }
 	}
 
-#endif
+
 
 #ifdef LOOK
 	/* If we need to extend it, we also need a new file_spaceid
diff --git a/nc_test4/tst_virtual_datasets.c b/nc_test4/tst_virtual_datasets.c
index acc3c1ce3..ff278a3dd 100644
--- a/nc_test4/tst_virtual_datasets.c
+++ b/nc_test4/tst_virtual_datasets.c
@@ -54,7 +54,7 @@ int read_back_contents(const char* filename) {
     int ncid, varid, ndims;
     size_t i;
     float data[VARIABLE_SIZE];
-    size_t i;
+
 
     char var_name[NC_MAX_NAME+1];
     int dimids_var[1], var_type, natts;