Remove netcdf-4 conditional on the dispatch table. #1443
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Partially address: Unidata#1056 Currently, some of the entries in the dispatch table are conditional'd on USE_NETCDF4. As a step in upgrading the dispatch table for use with user-defined tables, we remove that conditional. This means that all dispatch tables must implement the netcdf-4 specific functions even if only to make them return NC_ENOTNC4. To simplify this, a set of default functions are defined in libdispatch/dnotnc4.c to provide this behavior. The file libdispatch/dnotnc3.c is also relevant to this. The primary fix is to modify the various dispatch tables to remove the conditional and use the functions in libdispatch/dnotnc4.c as appropriate. In practice, all of the existing tables are prepared to handle this, so the only real change is to remove the conditionals. Misc. Unrelated fixes 1. Fix some annoying warnings in ncvalidator. Notes: 1. This has not been tested with either pnetcdf or hdf4 enabled. When those are enabled, it is possible that there are still some conditionals that need to be fixed.
edhartnett
approved these changes
Jul 20, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Partially address: #1056
Currently, some of the entries in the dispatch table
are conditional'd on USE_NETCDF4.
As a step in upgrading the dispatch table for use
with user-defined tables, we remove that conditional.
This means that all dispatch tables must implement the
netcdf-4 specific functions even if only to make them
return NC_ENOTNC4. To simplify this, a set of default
functions are defined in libdispatch/dnotnc4.c to provide this
behavior. The file libdispatch/dnotnc3.c is also relevant to
this.
The primary fix is to modify the various dispatch tables to
remove the conditional and use the functions in
libdispatch/dnotnc4.c as appropriate. In practice, all of the
existing tables are prepared to handle this, so the only
real change is to remove the conditionals.
Misc. Unrelated fixes
Notes:
When those are enabled, it is possible that there are still
some conditionals that need to be fixed.