From 2856ee751d5846374866207cc2b6554e56e60462 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 29 Apr 2022 12:36:33 -0600
Subject: [PATCH] restore

---
 dap4_test/test_remote.sh  |  4 +--
 include/nctestserver.h    | 12 ++++-----
 libdispatch/dinfermodel.c | 53 ++++++++++++++++++++++-----------------
 libdispatch/dutil.c       |  6 ++---
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/dap4_test/test_remote.sh b/dap4_test/test_remote.sh
index 20ed2a3a1..79f0b307b 100755
--- a/dap4_test/test_remote.sh
+++ b/dap4_test/test_remote.sh
@@ -70,8 +70,8 @@ for f in $F ; do
     if test "x$BIG" = x1; then
 	URL="[ucar.littleendian=0]${URL}"
     fi
-    if test "x$NOCSUM" != x1; then
-	URL="[dap4.checksum=crc32]${URL}"
+    if test "x$NOCSUM" = x1; then
+	URL="[ucar.checksummode=none]${URL}"
     fi
     if ! ${NCDUMP} ${DUMPFLAGS} "${URL}" > ${builddir}/results_test_remote/${f}.dmp; then
         failure "${URL}"
diff --git a/include/nctestserver.h b/include/nctestserver.h
index d645793ee..978210c85 100644
--- a/include/nctestserver.h
+++ b/include/nctestserver.h
@@ -19,7 +19,7 @@ See \ref copyright file for more info.
 #include <curl/curl.h>
 #include "netcdf.h"
 
-#define FINDTESTSERVER_DEBUG
+#undef FINDTESTSERVER_DEBUG
 
 enum KIND {NOKIND, DAP2KIND, DAP4KIND, THREDDSKIND};
 
@@ -208,17 +208,15 @@ timedping(const char* url, long timeout)
     /* Don't trust curl to return an error when request gets 404 */
     CERR((curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE, &http_code)));
     if(http_code >= 400) {
-	stat = CURLE_HTTP_RETURNED_ERROR;
+	cstat = CURLE_HTTP_RETURNED_ERROR;
 	goto done;
     }
-    
+
 done:
     if(cstat != CURLE_OK) {
 #ifdef FINDTESTSERVER_DEBUG
-	/* Get more detail */
-        curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE, &http_code);
-        fprintf(stderr, "curl error: %s; url=%s http_code=%ld\n",
-		curl_easy_strerror(cstat),url,http_code);
+        fprintf(stderr, "curl error: %s; url=%s\n",
+		curl_easy_strerror(cstat),url);
 #endif
 	stat = NC_ECURL;
     }
diff --git a/libdispatch/dinfermodel.c b/libdispatch/dinfermodel.c
index 74c5e908e..e6d725fa5 100644
--- a/libdispatch/dinfermodel.c
+++ b/libdispatch/dinfermodel.c
@@ -220,7 +220,6 @@ static const char* getmodekey(const NClist* envv);
 static int replacemode(NClist* envv, const char* newval);
 static int inferone(const char* mode, NClist* newmodes);
 static int negateone(const char* mode, NClist* modes);
-static int lcontains(NClist* l, const char* key0);
 
 /*
 If the path looks like a URL, then parse it, reformat it.
@@ -382,7 +381,7 @@ parseonchar(const char* s, int ch, NClist* segments)
 	if((q = malloc(slen+1)) == NULL) {stat = NC_ENOMEM; goto done;}
 	memcpy(q,p,slen);
 	q[slen] = '\0';
-	nclistpush(segments,q); q = NULL;
+	nclistpush(segments,q);
 	if(*endp == '\0') break;
 	p = endp+1;
     }
@@ -459,7 +458,7 @@ processmodearg(const char* arg, NCmodel* model)
 static int
 processmacros(NClist** fraglenvp)
 {
-    int i,stat = NC_NOERR;
+    int stat = NC_NOERR;
     const struct MACRODEF* macros = NULL;
     NClist*  fraglenv = NULL;
     NClist* expanded = NULL;
@@ -467,12 +466,12 @@ processmacros(NClist** fraglenvp)
     if(fraglenvp == NULL || nclistlength(*fraglenvp) == 0) goto done;
     fraglenv = *fraglenvp;
     expanded = nclistnew();
-    for(i=0;i<nclistlength(fraglenv);i+=2) {
+    while(nclistlength(fraglenv) > 0) {
 	int found = 0;
 	char* key = NULL;
 	char* value = NULL;
-	key = nclistget(fraglenv,i);
-	value = nclistget(fraglenv,i+1);
+	key = nclistremove(fraglenv,0); /* remove from changing front */
+	value = nclistremove(fraglenv,0); /* remove from changing front */
 	if(strlen(value) == 0) { /* must be a singleton  */
             for(macros=macrodefs;macros->name;macros++) {
                 if(strcmp(macros->name,key)==0) {
@@ -489,6 +488,8 @@ processmacros(NClist** fraglenvp)
 	    nclistpush(expanded,strdup(key));
     	    nclistpush(expanded,strdup(value));
 	}
+	nullfree(key);
+	nullfree(value);
     }
     *fraglenvp = expanded; expanded = NULL;
 
@@ -586,7 +587,7 @@ inferone(const char* mode, NClist* newmodes)
 static int
 mergekey(NClist** valuesp)
 {
-    int i;
+    int i,j;
     int stat = NC_NOERR;
     NClist* values = *valuesp;
     NClist* allvalues = nclistnew();
@@ -599,21 +600,27 @@ mergekey(NClist** valuesp)
 	if((stat=parseonchar(val1,',',allvalues))) goto done;
     }
     /* Remove duplicates and "" */
-    for(i=0;i<nclistlength(allvalues);i++) {
-	int found;
-	value = nclistget(allvalues,i);
-	if(strlen(value) == 0) continue;
-	found = lcontains(newvalues,value);
-	if(!found && value != NULL) {nclistpush(newvalues,strdup(value));}
+    while(nclistlength(allvalues) > 0) {
+	value = nclistremove(allvalues,0);
+	if(strlen(value) == 0) {
+	    nullfree(value); value = NULL;
+	} else {
+	    for(j=0;j<nclistlength(newvalues);j++) {
+	        char* candidate = nclistget(newvalues,j);
+	        if(strcasecmp(candidate,value)==0)
+	            {nullfree(value); value = NULL; break;}
+	     }
+	}
+	if(value != NULL) {nclistpush(newvalues,value); value = NULL;}
     }
     /* Make sure to have at least 1 value */
     if(nclistlength(newvalues)==0) nclistpush(newvalues,strdup(""));
-    *valuesp = newvalues; newvalues = NULL;
+    *valuesp = values; values = NULL;
 
 done:
-    nclistfreeall(allvalues);
-    nclistfreeall(newvalues);
+    nclistfree(allvalues);
     nclistfreeall(values);
+    nclistfreeall(newvalues);
     return check(stat);
 }
 
@@ -638,7 +645,7 @@ collectvaluesbykey(NClist* fraglenv, const char* key, NClist* values)
         const char* key2 = nclistget(fraglenv,i);
         if(strcasecmp(key,key2)==0) {
 	    const char* value2 = nclistget(fraglenv,i+1);
-	    nclistpush(values,strdup(value2));
+	    nclistpush(values,value2); value2 = NULL;
 	}
     }
 }
@@ -652,7 +659,7 @@ collectallkeys(NClist* fraglenv, NClist* allkeys)
     for(i=0;i<nclistlength(fraglenv);i+=2) {
 	char* key = nclistget(fraglenv,i);
 	if(!lcontains(allkeys,key)) {
-	    nclistpush(allkeys,strdup(key));
+	    nclistpush(allkeys,key);
 	}
     }
 }
@@ -676,12 +683,12 @@ cleanfragments(NClist** fraglenvp)
     newlist = nclistnew();
     buf = ncbytesnew();
     allkeys = nclistnew();
+    tmp = nclistnew();
 
-    /* collect copy of all unique keys */
+    /* collect all unique keys */
     collectallkeys(fraglenv,allkeys);
     /* Collect all values for same key across all fragments */
     for(i=0;i<nclistlength(allkeys);i++) {
-        tmp = nclistnew();
 	key = nclistget(allkeys,i);
 	collectvaluesbykey(fraglenv,key,tmp);
 	/* merge the key values, remove duplicate */
@@ -691,12 +698,12 @@ cleanfragments(NClist** fraglenvp)
 	nclistpush(newlist,key);
 	value = list2string(tmp);
 	nclistpush(newlist,value);
-	nclistfreeall(tmp); tmp = NULL;
+	nclistclear(tmp);
     }
     *fraglenvp = newlist; newlist = NULL;
 done:
-    nclistfreeall(allkeys);
-    nclistfreeall(tmp);
+    nclistfree(allkeys);
+    nclistfree(tmp);
     ncbytesfree(buf);
     nclistfreeall(fraglenv);
     nclistfreeall(newlist);
diff --git a/libdispatch/dutil.c b/libdispatch/dutil.c
index d4b37a344..b8f48e17c 100644
--- a/libdispatch/dutil.c
+++ b/libdispatch/dutil.c
@@ -211,11 +211,11 @@ NC_mktmp(const char* base)
     int fd = -1;
     char* tmp = NULL;
     size_t len;
-#ifndef HAVE_MKSTEMP
-    int tries;
 #define MAXTRIES 4
-#else
+#ifdef HAVE_MKSTEMP
     mode_t mask;
+#else
+    int tries;
 #endif
 
     len = strlen(base)+6+1;