Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up a couple small things while I'm looking at them. #3076

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Clean up a couple small things while I'm looking at them. #3076

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fdf1e4
Clean up a couple small things while I'm looking at them.
WardF Jan 15, 2025
ca634d3
Merge branch 'main' into tiny-cleanup.wif
WardF Jan 15, 2025
2ef02c0
Avoid name conflict in artifact upload.
WardF Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#####
Expand Down
4 changes: 2 additions & 2 deletions libdap4/d4meta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand Down
Loading