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

Jump to bottom

Rinse and Repeat: PR Edition #1309

Merged
merged 40 commits into from
Feb 7, 2019
Merged

Rinse and Repeat: PR Edition #1309

merged 40 commits into from
Feb 7, 2019

Conversation

WardF
Copy link
Member

@WardF WardF commented Feb 6, 2019

mathstuf and others added 30 commits January 16, 2019 15:51
@mathstuf
ncconfigure: add NC_UNUSED macro
eda449b 
This should be used to indicate that a variable is unused in a
codeblock.
@mathstuf
warnings: mark conditionally used parameters
a747216
@mathstuf
ncuri: check the right preprocessor definition
eb0b9b8
@mathstuf
warnings: mark unused parameters
b3f3443
@mathstuf
NC_mktmp: pass the remaining space to strncat
94a0259 
This could overflow if `tmp` only had a few bytes left in its space
given its current contents.
@mathstuf
warnings: store sizes in size_t
8c33122
@mathstuf
nctime: expand basetime's size
82d72df 
It ends up being `basetime_1 + basetime_2` with a space in between. Make
enough room to ensure that it is not truncated.
@edhartnett
changed var atts_not_read to atts_read
243cef8
@edhartnett
changed NC_GRP_INFO_T to use atts_read instead of atts_not_read
840d51d
@edhartnett
fixed HDF4
6f1d0b8
@WardF
Merge branch 'master' into fix-warnings
688c06d
@edhartnett
added rename test to tst_rename2.c which fails :-(
713804e
@edhartnett
fixed rename bug
66cc9c5
@edhartnett
Merge branch 'master' into ejh_not_read_rename_2
b2bd903
@edhartnett
Merge branch 'master' into ejh_rename_bug
a89f9dd
@WardF
Update CmakeLists.txt in support of #1295
766d2ac
@edhartnett
created function create_dim_wo_var()
42c6459
@edhartnett
added function give_var_secret_name()
627a55c
@edhartnett
removed name param from function give_var_secret_name()
c95887c
@edhartnett
made function give_var_secret_name() not static, fixed warning
e74ec6f
@edhartnett
made function give_var_secret_name() static again
660bda1
@edhartnett
now creating secret hdf5 name on var rename, if needed
784dc0e
@edhartnett
added name parameter to give_var_secret_name to base secret name on
1b3f397
@edhartnett
now using secret hdf5 var name during renames if needed
828304e
@edhartnett
more testing
e859be9
@edhartnett
more testing
b379663
@edhartnett
more testing
fcae21b
@WardF
Merge branch 'master' into gh1295.wif
79e8089
@WardF
Merge branch 'master' into ejh_rename_var_to_non_coord_var
299b215
@edhartnett
Merge branch 'master' into ejh_not_read_rename_2
f0ec05c
edhartnett and others added 9 commits January 30, 2019 12:17
@edhartnett
Merge branch 'master' into ejh_rename_bug
9cde4f0
@WardF
Merge branch 'master' into fix-warnings
9ca942b
@WardF
Some housekeeping. Next big push may be to clean up older files.
455bf13
@WardF
Move away from deprecated PackageManager to the productbuild generator.
5fca0ed
@WardF
Merge branch 'fix-warnings' of https://github.com/mathstuf/netcdf-c i…
67086cc 
…nto pr-aggregation.wif
@WardF
Merge branch 'ejh_not_read_rename_2' of https://github.com/NetCDF-Wor…
2c33546 
…ld-Domination-Council/netcdf-c into pr-aggregation.wif
@WardF
Merge branch 'ejh_rename_bug' of https://github.com/NetCDF-World-Domi…
9aae035 
…nation-Council/netcdf-c into pr-aggregation.wif
@WardF
Merge remote-tracking branch 'origin/gh1295.wif' into pr-aggregation.wif
ecc11ed
@WardF
Merge branch 'ejh_rename_var_to_non_coord_var' of https://github.com/…
035b303 
…NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif
@WardF WardF added this to the 4.6.3 milestone Feb 7, 2019
@WardF WardF merged commit a260bbb into master Feb 7, 2019
@WardF WardF deleted the pr-aggregation.wif branch February 7, 2019 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DennisHeimbigner DennisHeimbigner Awaiting requested review from DennisHeimbigner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.6.3
Development

Successfully merging this pull request may close these issues.
3 participants
@WardF @mathstuf @edhartnett