Commit Graph

288 Commits

Author SHA1 Message Date
Ward Fisher
2fa4229bb6 Added a file to be cleaned up 2016-11-15 14:39:59 -07:00
Ward Fisher
da48bc61e8 Renamed file added in support of https://github.com/Unidata/netcdf-c/issues/323 2016-11-15 14:27:21 -07:00
Ward Fisher
40b6dee9da Added some comments to the CDL file, removed older files. 2016-11-15 14:25:48 -07:00
Ward Fisher
915d6ec9be Another temporary cdl file added. 2016-11-15 13:48:58 -07:00
Ward Fisher
e879a3c78b Added some temporary debugging files. 2016-11-15 13:48:44 -07:00
Ward Fisher
6c6bccfd9c *possible* fix for https://github.com/Unidata/netcdf-c/issues/323 but further investigation required. 2016-11-15 13:48:20 -07:00
Ward Fisher
505e5ba140 Some modifications to alignment test, offsets. 2016-11-15 11:22:52 -07:00
Ward Fisher
4f21078fe5 Added initial debug stuff to gdb script. 2016-11-15 10:22:15 -07:00
Ward Fisher
0c83a5960b Added a test file for https://github.com/Unidata/netcdf-c/issues/323 2016-10-31 10:54:06 -06:00
DennisHeimbigner
4984536a60 Merge branch 'master' into issue314.dmh 2016-09-02 14:18:41 -06:00
Dennis Heimbigner
e2967bb622 Fix for Github issue 314.
Problem was in oc2/dap.y.
In definition of errormsg:, change WORD_WORD to WORD_STRING
since the msg field of an opendap error response is a quoted
string.

Also took the opportunity to modify ncgen to
transfer the logging level (-L flag) into the c-code
generated using -lc.
2016-09-01 22:06:07 -06:00
Bas Couwenberg
988b4ff868 Fix spelling errors.
* characers -> characters
 * varaible  -> variable
2016-08-28 15:45:36 +02:00
Ward Fisher
6d5a924354 Addressed coverity issue 719941, missing varargs cleanup. 2016-07-06 15:41:49 -06:00
Ward Fisher
8507d923b7 Fixed a typo in 'makeparser' ncgen/ target. 2016-07-06 15:32:53 -06:00
Ward Fisher
bb96050e66 Addressed a UNIX API issue reported by clang. 2016-06-20 15:19:18 -06:00
Ward Fisher
2e71768c47 Fenceposted includes to nc4internal.h in support of https://github.com/Unidata/netcdf-c/issues/275 2016-06-08 11:26:37 -06:00
Ward Fisher
a7b7d216b2 Corrected an issue on Linux, jumping back over to Windows to see if the issue persists. 2016-05-11 15:38:45 -06:00
Ward Fisher
ef2c6f9bc4 Things are working? 2016-05-11 15:31:17 -06:00
Ward Fisher
8373de2f12 Corrected an issue with compiling under Visual Studio. 2016-05-11 12:44:25 -06:00
Ward Fisher
fc0d7d0d80 Added a tweak to prevent problems with ncdump and hdf5 trying to correct for a lack of ssize_t. 2016-05-10 15:52:46 -06:00
Dennis Heimbigner
272e6f4022 Oops, forgot to test nc3 only.
Fixed some errors from that case.
2016-05-07 14:32:07 -06:00
Dennis Heimbigner
11a259ad86 Add provenance info for netcdf-4 files.
This consists of a persistent attribute named
_NCProperties plus two computed attributes
_IsNetcdf4 and _SuperblockVersion.
See the 'Provenance Attributes' section
of docs/attribute_conventions.md for details.
2016-05-07 14:32:07 -06:00
Bas Couwenberg
eb2561aaab Fix 'atttributes' typo, replace with 'attributes'. 2016-01-15 02:17:29 +01:00
Dennis Heimbigner
39e9cd0ffe Fix issues with Github pull request 187
(https://github.com/Unidata/netcdf-c/pull/187)
Primary problem was cmake build errors.
2016-01-08 12:55:11 -07:00
Dennis Heimbigner
d15f277252 The max dimension sizes do not take CDF-5 format into account.
NetCDF-c Github issue #185

The code in libsrc/dim.c has not been upgraded to support
CDF-5 format.

Rule we are implementing sets the max dimension sizes as follows:

Classic:	CDF-1	NC_MAX_INT - 3    = 2147483647 - 3
64 bit Offset:	CDF-2	NC_MAX_UINT - 3	  =  4294967295 - 3
64 bit Data:	CDF-5	NC_MAX_UINT64 - 3 = 18446744073709551615 - 3

The -3 is to handle rounding.
2016-01-05 21:26:25 -07:00
dmh
cbb6df3232 Github issue 152: https://github.com/Unidata/netcdf-c/issues/152
User request to have all orphaned DAP2 attributes kept as netcdf
global attributes. This is primarily a change in the oc code
nplus testcase dataset changes.

Result may be inconsistent with netcdf-Java output.
2015-11-29 20:38:12 -07:00
Ward Fisher
fce30a0d32 Updated ncgenl.c 2015-11-26 17:47:30 -06:00
Ward Fisher
04de3d3fa2 Merge branch 'NCF-345' into github156 2015-11-24 17:20:07 -06:00
Ward Fisher
dd2201621e Addressed an API-related usage of strncmp. 2015-11-24 17:19:36 -06:00
Ward Fisher
8ebbd2a9c5 Updated makeparser target. 2015-11-24 16:16:23 -06:00
dmh
47e10591b4 ckp 2015-11-19 13:44:55 -07:00
Ward Fisher
3766923ecf Added test for [NCF-345] 2015-11-13 10:33:19 -07:00
Ward Fisher
21601f669b Applied a patch to fix a bug on cygwin64. The patch was contributed by Marco Atzeri. 2015-11-11 15:36:02 -07:00
dmh
413e49d758 1. There were several bugs in ncdump/dumplib.c
that were not taking the CDF-5 format into account.

2. Had to update ncgen.1 man page to define the new
   k-flag rules to deal with cdf-5.

3. Had to fix some tests that use 'cmp' for comparison;
   this really should be deprecated.

3. There was a bug in configure.ac with respect
   to using the enable-netcdf-4 flag vs
   using disable-netcdf-4.
2015-11-06 17:03:28 -07:00
Ward Fisher
612b35a84c Merge branch 'master' into cdf-5, in preparation for merging the CDF-5 functionality into the master branch. This will be the key new feature for netcdf 4.4.0. 2015-11-05 13:40:35 -07:00
Ward Fisher
3bb62c3314 Corrected a logic error preventing ncgen from creating cdf-5 files. 2015-11-02 16:11:29 -07:00
Ward Fisher
991d127158 Tweaked ncgen test script to actually *check* to see if the file it says it's creating was created. 2015-11-02 13:58:55 -07:00
Ward Fisher
a359cb6a53 Reverted some of the spelling corrections. Some misspellings were intentional 2015-10-16 14:36:17 -06:00
dmh
8fc86035b2 merge-squash 2015-10-09 10:22:00 -06:00
dmh
087ae58ffd cleanup and squash changes vav master 2015-10-09 10:12:11 -06:00
dmh
49597a64af merge-squash 2015-10-09 10:12:11 -06:00
tbeu
e2820e4d8a Fix common typos
Detected by https://github.com/vlajos/misspell_fixer
2015-08-20 11:42:05 +02:00
dmh
fab66699d1 Moved libsrc5 to libsrcp
because pnetcdf is used for
more than CDF-5 files.
2015-08-14 20:39:56 -06:00
Russ Rew
a62c9d3059 Fix conflicts after merge 2015-08-02 17:29:36 -06:00
Russ Rew
2e029a3058 More cleanups from clang warnings. 2015-08-02 17:23:32 -06:00
Russ Rew
0687dfe5a2 Cleanup clang warnings. 2015-08-02 17:22:50 -06:00
Russ Rew
ec89eb5806 Fix ncdump clang warnings. Fix invalid encodings for some non-ascii strings in tests. 2015-08-02 16:09:47 -06:00
Ward Fisher
679048ee2a Corrected a potential use of a pointer after it had been freed. See Coverity Issue: 1265731 2015-07-29 14:55:20 -06:00
Ward Fisher
83692b10d6 Addressed a potential null dereference reported by clang. 2015-06-18 14:41:09 -06:00
Ward Fisher
39c9d10ede Removed a stray debugging message. 2015-06-18 14:37:31 -06:00
Ward Fisher
66dc490e8a Addressed UNIX API issues reported by clang. 2015-06-18 14:31:10 -06:00
Ward Fisher
af81e0cb24 Fixed a unix API error reported by clang. 2015-03-31 11:19:49 -06:00
Ward Fisher
fe1b96cdd9 Updated CMakelists to remove debug, release subdirectories on Windows. Updating shell scripts to work with MSYS paths. 2015-02-02 14:46:50 -07:00
Ward Fisher
80bf9a0aa2 Resolved conflict. 2015-01-16 09:28:07 -07:00
Nico Schlömer
6d2b61ddb7 hyphens used as minus signs 2015-01-16 13:12:11 +01:00
Nico Schlömer
a9f4ea96c1 Update ncgen.1 2015-01-16 10:02:00 +01:00
Russ Rew
4eefcd4707 Typos and consistency fixes in docs 2014-12-29 14:22:26 -07:00
Russ Rew
db83a3be4c Jira issue NCF-314, "Provide replacement for using numeric values of -k
option on nccopy and ncgen".
2014-12-29 13:07:28 -07:00
Russ Rew
9a60dc612f Use short "-k" codes instead of deprecated version numbers for ncgen and nccopy tests 2014-12-28 22:42:05 -07:00
dmh
3a559d3f1d Fix occurlflags bug 2014-12-28 15:54:02 -07:00
Russ Rew
6ca14d8a78 Update ncgen code and docs to use nco-type format codes and deprecate use of confusing format version numbers 2014-12-28 10:44:21 -07:00
Peter Jansen
7aa25f4e7b Fix java generation for nan values, use Float.NaN and Double.NaN 2014-11-08 10:11:53 -03:00
Peter Jansen
ba5d3ca50a fix infinite loop seg fault, where codify called jcodify called codify, should have been jcodify calling ccodify 2014-11-07 14:46:04 -03:00
dmh
7c7db22bc7 Removed some useless code 2014-10-11 12:27:17 -06:00
dmh
b76d1ee722 re: NCF-318
Fixed bug in ncgen. When classic format was in force (k=1 or
k=4), the "long" datatype should be treated as int32. Was
returning an error.
2014-10-10 15:00:40 -06:00
dmh
1739c50622 Modified a number of tests
to make use of remotetest.unidata.ucar.edu
optional. Purpose is purely for testing
new dts and thredds servers.
2014-10-04 15:59:16 -06:00
Ward Fisher
a8009ba312 Coverity: 1229128 corrected. 2014-10-03 12:38:32 -06:00
Ward Fisher
85e8e7e945 Addressed man page syntax warnings reported in github issue 52, https://github.com/Unidata/netcdf-c/issues/52 2014-10-03 10:46:02 -06:00
Ward Fisher
3fde3da0a7 Fixed a potential null dereference in ncgen. 2014-10-02 11:28:07 -06:00
Ward Fisher
a451f546da Fixed a malloc issue on some systems. 2014-10-01 16:42:27 -06:00
Ward Fisher
cad531a487 Corrected a clang-reported issue where NULL might be passed to emalloc(). 2014-09-30 11:42:44 -06:00
dmh
8074e0fdec re: Jira NCF-309
The code for handling character constants
in datalists in ncgen has some problems.
1. It failed on large constants
2. It did not handle e.g. var = 'a', 'b', ...
   in the same way that ncgen3 did.
3. The code for generate.c and genchar.c needed
   some refactoring to make it a little simpler
   (but not simple).
2014-09-22 14:50:59 -06:00
dmh
84c1af3b0a fix valgrind discovered problem 2014-09-22 14:31:19 -06:00
dmh
7e582ad3f2 re: Jira NCF-309
The code for handling character constants
in datalists in ncgen has some problems.
1. It failed on large constants
2. It did not handle e.g. var = 'a', 'b', ...
   in the same way that ncgen3 did.
3. The code for generate.c and genchar.c needed
   some refactoring to make it a little simpler
   (but not simple).
2014-09-18 18:26:06 -06:00
Ward Fisher
b43813d821 When using the '-ansi' flag with gcc, netcdf would fail to build because of the use of '//' for one-line comments. I've addressed this by replacing instances of // with enclosing comment blocks. 2014-08-26 11:19:32 -06:00
Russ Rew
1205960b0e Document that ncgen input can come from stdin 2014-08-24 16:58:26 -06:00
dmh
46063247cb conflict resolution 2014-08-17 12:52:53 -06:00
dmh
18eb1c1126 Coverity fixing 2014-08-17 12:03:23 -06:00
Ward Fisher
56a0f8620f Coverity: 711940 2014-08-15 15:50:49 -06:00
Ward Fisher
dc93496654 Coverity: 711707 2014-08-15 15:42:13 -06:00
Dennis Heimbigner
f2e2a2c266 Fix coverity errors CID 1230781
and 1230782,
2014-08-11 16:12:14 -06:00
Ward Fisher
421b999a0e Coverity 711857 2014-08-11 13:21:01 -06:00
Ward Fisher
773024aa4f Addressed Coverity issue 711896 2014-07-29 11:00:44 -06:00
dmh
cd2574ba7c Change assertion failure to a error 2014-07-23 11:25:49 -06:00
Ward Fisher
7f812b367e Manual merge of pull request https://github.com/Unidata/netcdf-c/pull/64 contributed by nschloe. Assorted CMake improvements. 2014-06-11 15:51:31 -06:00
Ward Fisher
9d6eb045ad Corrected static analysis issue 2014-04-22 15:54:47 -06:00
Ward Fisher
52b2edab9b Cleaned up clang-reported issue: dead assignment. 2014-04-21 10:56:57 -06:00
Ward Fisher
18f23a0e47 Fixed clang-reported issue: Dead assignment. 2014-04-21 10:30:43 -06:00
Ward Fisher
d94af8cc89 Fixed clang-reported error: calling strlen on null pointer. 2014-04-19 14:18:53 -06:00
dmh
389d2ea394 fix some coverity complaints 2014-04-07 13:00:47 -06:00
Dennis Heimbigner
464d5fc8bb 1. Add then remove some debugging info
for testing jna
2. add some personal scripts (*jna)
   to support creating jna dlls.
2014-04-03 15:46:12 -06:00
dmh
a189b98b0b 1. Any test that references nctestserver/NC_findtestserver
should be under ENABLE_DAP_REMOTE_TESTS.
   Fixed to make sure that this is so.
   Also attempted to fix ncdap_test/CMakeLists.txt,
   but probably got it wrong.
   HT to Nico Schlomer.
2. Attempted to reduce the number of conversion errors
   when -Wconversion is set. Fixed oc2, but
   rest of netcdf remains to be done.
   HT to Nico Schlomer.
3. When doing #2, I discovered an error in ncgen.y
   that has remained hidden. This required some other
   test case fixes.
2014-03-08 20:41:30 -07:00
dmh
baade3e4fc [NCF-293]
Allow .cdl files to have a leading utf-8 BOM.
Also add test.
2014-03-07 22:52:40 -07:00
Quincey Koziol
cd71eb525c Corrected "BAIL" macros to avoid infinite loop when logging is disabled and an
error occurs after an "exit:" label.

Corrected a dozen Coverity errors (mainly allocation issues, along with a few
    other things):
        711711, 711802, 711803, 711905, 970825, 996123, 996124, 1025787,
        1047274, 1130013, 1130014, 1139538

Refactored internal fill-value code to correctly handle string types, and
    especially to allow NULL pointers and null strings (ie. "") to be
    distinguished.  The code now avoids partially aliasing the two together
    (which only happened on the 'write' side of things and wasn't reflected on
    the 'read' side, adding to the previous confusion).

    Probably still weak on handling fill-values of variable-length and compound
    datatypes.

Refactored the recursive metadata reads a bit more, to process HDF5 named
    datatypes and datasets immediately, avoiding chewing up memory for those
    types of objects, etc.

Finished uncommenting and updating the nc_test4/tst_fills2.c code (as I'm
    proceeding alphabetically through the nc_test4 code files).
2013-12-29 01:12:43 -06:00
dmh
8fbb4a68d5 Merge branch 'master' of https://github.com/Unidata/netcdf-c
Rebasing
2013-12-19 09:36:05 -07:00
dmh
564a9d56a4 Merge branch 'master' of https://github.com/Unidata/netcdf-c 2013-12-10 11:23:10 -07:00
Quincey Koziol
b3044de434 Refactored read_scale(), memio_new(), var_create_dataset() and makespecial()
to clean up resources properly on failure.

Refactored doubly-linked list code for objects in the libsrc4 directory,
    cleaning up the add/del routines, breaking out the common next/prev
    pointers into a struct and extracting the add/del operations on them,
    changed the list of dims to add new dims in the same order as the other
    types, made all add routines able to optionally return a pointer to the
    newly created object.

Removed some dead code (pg_var(), nc4_pg_var1(), nc4_pg_varm(), misc. small
    routines, etc)

Fixed fill value handling for string types in nc4_get_vara().

Changed many malloc()+strcpy() pairs into calls to strdup().

Cleaned up misc. other minor Coverity issues.
2013-12-08 03:29:26 -06:00
dmh
c6cbfb57f5 Removed old code from NCF213 2013-12-07 20:19:53 -07:00
Quincey Koziol
4a894dc154 Correct minor unmerged change. 2013-12-01 00:09:27 -06:00
Quincey Koziol
5ccb8a24b5 Merge branch 'master' into ncf-177 2013-11-30 23:40:26 -06:00