Commit Graph

75 Commits

Author SHA1 Message Date
Dennis Heimbigner
9979a2fa60 Synch with oc2.0 2013-06-26 21:46:54 +00:00
Dennis Heimbigner
628aed80d9 1. synch changes with oc2.0
2. Fix a bug in ncgen to
   catch a special case of a malformed
   datalist.
2013-06-26 18:55:30 +00:00
Ward Fisher
33d3d06971 Added initial 'make dist', 'make distcheck' support to
CMake-based builds.
2013-06-03 16:42:04 +00:00
Ward Fisher
da16fc1cde Fixed an issue with Windows builds
not compiling due to how
ssize_t was being detected/defined.
2013-05-24 21:19:07 +00:00
Dennis Heimbigner
228e8439d2 1. The code to parse a constraint
was losing the initial double quote
for a quoted string.
2. The code in ncuri.c was not properly
   handling occurrences of e.g. %xx
2013-05-16 21:37:58 +00:00
Dennis Heimbigner
254c0e7c96 Historically
ncgen3 and ncgen
have treated 
uppercase atomic types
the same as lower case.
Change so upper case are no
longer allowed.

Also, synch oc.
2013-05-15 17:37:04 +00:00
Dennis Heimbigner
de34ed2d5b merge from netcdf/trunk prior to merge back to trunk 2013-05-11 19:37:38 +00:00
Dennis Heimbigner
3b0fb5bd82 Synch oc2 with baseline oc2.0 2013-05-11 19:36:31 +00:00
Dennis Heimbigner
c583f91992 merge with trunk and fix conflicts 2013-05-10 17:04:28 +00:00
Ward Fisher
10807379c3 Merging from CMake branch in preparation for 4.3.0 release. 2013-04-29 20:15:57 +00:00
Ward Fisher
67f96188ff Merged latest from netCDF-cmake branch in preparation for 4.3.0 release. 2013-04-23 21:50:07 +00:00
Ward Fisher
b113f6f8b6 Merged a handful of changes from netcdf-cmake branch.
Addressed the following coverity issues:

711762
711763
711766
711788
711933
711934
711935
2013-04-16 23:02:54 +00:00
Ward Fisher
405f8bf827 2013-04-01 23:05:45 +00:00
Ward Fisher
9f187a1484 Merged the fix for NCF-29 from Quincy into the trunk. 2013-03-26 18:57:26 +00:00
Dennis Heimbigner
c659633d2e merge from trunk 2013-03-26 16:45:02 +00:00
Dennis Heimbigner
4e41843740 1) fix some minor bugs when pnetcdf is enabled 2)Comment out some apparently unused procedures 2013-03-25 17:12:50 +00:00
Dennis Heimbigner
9b4db7a039 Make some things static that do not need to be externally visible 2013-03-24 17:33:17 +00:00
Ward Fisher
f26a4a559a Merged latest from netcdf-cmake branch.
Addressed several cmake-related issues, in terms of
building on Windows.  Also added XGetopt.c to 
EXTRA_dist in Makefile.am files.
2013-03-19 22:40:15 +00:00
Dennis Heimbigner
665c2c33b2 synchronize oc2 with oc2.0 2013-03-15 21:44:59 +00:00
Dennis Heimbigner
dea3c726c8 merge trunk into this branch 2013-03-15 20:31:07 +00:00
Ward Fisher
ceb736c4b5 Corrected bug introduced via typo. Bug identified
by Coverity. Thanks, Coverity!
2013-03-14 23:23:36 +00:00
Ward Fisher
6096f6b43b Merged changes from CMake branch.
Addressed a handful of memory leaks
reported by Coverity.
2013-03-14 22:49:21 +00:00
Dennis Heimbigner
c18c90b012 removed some unused local variables 2013-03-12 20:45:58 +00:00
Dennis Heimbigner
6cf31dcf2d jira: NCF-232: bad conversion of grids 2013-02-26 04:31:06 +00:00
Ward Fisher
ddf3c31bb0 Corrected a handful of syntax issues in CMake config files,
probably introduced more.  

Added CMake-related files to Makefile.am files for inclusion
when creating a distribution package.
2013-02-20 23:28:28 +00:00
Ward Fisher
12b7ac7048 o Improved package_source support in CMake-based builds.
o Corrected an issue related to uninitialized variables
which caused test failures on 2 test systems under
very specific circumstances.
2013-02-19 23:29:41 +00:00
Dennis Heimbigner
70186d5329 Fix bug in dataError when no error message is found 2013-02-11 23:32:46 +00:00
Dennis Heimbigner
4109174d00 Add quick check for Error {...} at start of the datadds data part 2013-02-07 22:14:57 +00:00
Dennis Heimbigner
bf18c79ce4 include oc2/dap.y in the distribution 2013-01-31 03:34:59 +00:00
Dennis Heimbigner
2200f01f4d fix NCF-218: bug in oc2/dap.y parser 2013-01-30 22:56:12 +00:00
Ward Fisher
71a30406f7 Corrected 2 windows-specific errors when using Visual Studio:
1. In nc4hdf.c, had a variable declaration located such
that Visual Studio complained and threw an error. Moved
to head of function.

2. Visual Studio was complaining about variable declarations
being made after OCVERIFY/OCDEREF macros.
2013-01-29 23:33:59 +00:00
Dennis Heimbigner
460ac331e0 1)synchronize with original oc2 2) add some convenience functions 2013-01-29 21:22:05 +00:00
Ward Fisher
21523c8582 Merged changes from cmake branch. oc2 changes are just
'file property' changes, not sure what exactly.
2012-12-20 21:50:45 +00:00
Dennis Heimbigner
c11e78314e periodic sync of oc2 dir with the official oc2.0 repository 2012-12-18 21:08:23 +00:00
Dennis Heimbigner
c684a02d87 fix typo 2012-12-07 00:23:50 +00:00
Dennis Heimbigner
c114861e68 fix dfile.c error reporting 2012-12-06 21:17:36 +00:00
Ward Fisher
81280c7878 Merge from latest netcdf-cmake branch.
- Fixes for Windows.
- CMake-based changes (functionality, tests).
- Smattering of coverity-informed bug-fixes.
2012-12-05 18:35:42 +00:00
Ward Fisher
f844126d0e Addressed a buffer overrun issue; making the assumption this is an
error. On the off chance it wasn't an error, a proper fix will be
formulated.
2012-12-05 17:44:39 +00:00
Dennis Heimbigner
ec761ec8fb null=>NULL error 2012-12-04 23:32:32 +00:00
Dennis Heimbigner
97344d8551 make consistent with svn/oc2.0 2012-12-04 03:32:41 +00:00
Dennis Heimbigner
0803ba20ba fix Jira NCF-208; but note that this causes test.06 to fail because thredds mishandles grids 2012-11-21 23:57:42 +00:00
Ward Fisher
ff631c8156 Merged latest changes from cmake branch.
o Improved CMake support.
o Cmake module compatibility (netcdf-config*.cmake.in).
2012-11-19 21:43:12 +00:00
Ward Fisher
afa67452f6 Took some time to address a handful of errors identified by Coverity.
Primarily focused on memory errors falling into a couple different types:

1) Static overrun errors.
2) Dereference uninitialized memory errors.

make distcheck works after applying these fixes, and coverity no longer sees an issue, so hopefully they are properly resolved.
2012-11-14 18:24:45 +00:00
Ward Fisher
45f77090a1 Addressed a handful of minor 'fixed-length buffer overrun'
errors identified by Coverity.  The fixes involved replacing calls
to strcpy, strcat with strncpy, strncat.
2012-10-31 21:31:47 +00:00
Ward Fisher
95bb271925 A few changes related to MSVC builds slipped through the previous merge. 2012-09-28 23:02:35 +00:00
Ward Fisher
7a226dd3f1 Merging the win_netcdf branch into the trunk. 2012-09-27 22:50:41 +00:00
Ward Fisher
34efd517f9 2012-09-21 17:37:57 +00:00
Ward Fisher
405bcacdc9 Corrected an error on my part. 2012-09-20 21:19:34 +00:00
Ward Fisher
650c6fe362 Corrected MSVC-related issues with DAP. Renamed variables to avoid collision with reserved words, enclosed includes with appropriate ifdefs, other minor changes. 2012-09-20 16:31:31 +00:00
Ward Fisher
e55d002dbc Merged Dennis' changes from trunk. 2012-09-06 21:15:37 +00:00