Merge pull request #3076 from WardF/tiny-cleanup.wif

Clean up a couple small things while I'm looking at them.
Unidata · Jan 15, 2025 · 5887c9e · 5887c9e
2 parents 85c8bc8 + 2ef02c0
commit 5887c9e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
@@ -91,10 +91,10 @@ jobs:
       - name: Upload autoconf test results
         uses: actions/upload-artifact@v4
         with:
-          name: cygwin-autotools-test-logs
+          name: cygwin-autotools-test-logs-${{ github.run_id }}
           path: |
-            */*.log
-            */*.trs
+        */*.log
+        */*.trs
 
   build-and-test-cmake:
     name: Cygwin-based CMake tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1649,10 +1649,6 @@ install(FILES ${netCDF_BINARY_DIR}/netcdf.pc
 ##
 print_conf_summary()
 
-# Enable Makedist files.
-ADD_MAKEDIST()
-ENABLE_MAKEDIST(README.md COPYRIGHT RELEASE_NOTES.md INSTALL INSTALL.cmake test_prog.c lib_flags.am cmake CMakeLists.txt COMPILE.cmake.txt config.h.cmake.in cmake_uninstall.cmake.in netcdf-config-version.cmake.in netcdf-config.cmake.in FixBundle.cmake.in nc-config.cmake.in configure configure.ac install-sh config.h.in config.sub CTestConfig.cmake.in)
-
 #####
 # Configure and print the libnetcdf.settings file.
 #####

diff --git a/libdap4/d4meta.c b/libdap4/d4meta.c
@@ -893,7 +893,7 @@ decodeEconst(NCD4meta* builder, NCD4node* enumtype, const char* nameorval, union
 {
     size_t i;
     int ret = NC_NOERR;
-    union ATOMICS number;
+    union ATOMICS number = {0};
     NCD4node* match = NULL;
 
     /* First, see if the value is an econst name */
@@ -902,7 +902,7 @@ decodeEconst(NCD4meta* builder, NCD4node* enumtype, const char* nameorval, union
         if(strcmp(ec->name,nameorval)==0) {match = ec; break;}
     }
     /* If no match, try to invert as a number to see if there is a matching econst */
-    if(!match) {
+    if(!match && enumtype->en.econsts) {
         /* get the incoming value as number */
         if((ret=convertString(&number,enumtype->basetype,nameorval)))
             goto done;