Commit Graph

274 Commits

Author SHA1 Message Date
Ward Fisher
cdf7717666 Updated OFF_T_MAX computation to avoid an undefined behavior warning reported by clang/gcc. 2016-09-26 10:14:38 -06:00
Greg Sjaardema
586e832f64 Fix variable and dimension renaming for nc3 with hashmap
The problem is that the name was being updated prior to the old
variable being removed from the hashmap. It checks whether the key and
the name of the variable being removed match, but since the name had
already been updated, the names did not match so the variable was not
removed. This patch removes the variable from the hashmap first,
then updates the name, and then adds the variable with the new name to
the hashmap.

Similar change for renaming dimensions.
2016-07-11 15:44:40 -04:00
Ward Fisher
3e24dcd575 Removed some dead assignments reported by clang. 2016-06-20 15:28:46 -06:00
Dennis Heimbigner
b4dc1dca19 More cmake fixes 2016-05-07 14:32:07 -06:00
Ward Fisher
00eaa53e0b Corrected an issue preventing gcc-4.4 from compiling netcdf. 2016-04-26 21:09:41 +00:00
Ward Fisher
3c820589b7 Fixed a divide by zero error. 2016-04-12 11:04:41 -06:00
Ward Fisher
9d91a9684a Merge branch 'gh252' 2016-04-12 10:03:40 -06:00
Ward Fisher
baec7157a3 Clean up lingering 'make distcheck' errors. 2016-04-12 09:48:21 -06:00
Ward Fisher
3f773258bd Corrected an issue with hashmap and missing random() function on Windows using Visual Studio 2013 2016-04-11 16:07:27 -06:00
Ward Fisher
cc803f5c00 Merge branch 'nc3-hashmap-fix' of https://github.com/gsjaardema/netcdf-c into merge-gh246 2016-04-05 15:31:06 -06:00
Ward Fisher
33e43e15f1 Merge branch 'master' into gh240 in preparation for final merge. 2016-04-05 20:28:03 +00:00
Ward Fisher
6409b11640 Modified nc_inq_type so that it will return valid information for valid data types even if the associated ncid doesn't have access to those data types. See https://github.com/Unidata/netcdf-c/issues/240 for more information. 2016-04-05 20:13:42 +00:00
Greg Sjaardema
09454cba09 Fix accessing deleted memory 2016-04-05 09:47:12 -06:00
Greg Sjaardema
1f9eb8093c Fix duplicate key issues in nc_hashmap
The addition of the nc_hashmap to facilitate quick
retrieval of var and dim by name did not take into
account key collisions -- two or more names hashed
to the same value.  If the keys matched, it assumed
that the names matched also.

This change fixes this incorrect assumption and
checks both the key (which is the hash of the name)
and if the keys match, it also checks that the names
match.

While there have been no instances of duplicate keys,
they are certain to occur and cause difficult to
debug issues. This fix eliminates that defect.
2016-04-05 09:07:40 -06:00
Greg Sjaardema
43ef27a407 Revert array geometric growth option 2016-03-24 06:44:41 -06:00
Greg Sjaardema
a248e0dfbe Free hashmap to eliminate memory leaks 2016-03-24 06:38:45 -06:00
Greg Sjaardema
d5cb4b9e3e Add hashmap for quick retrieval of dim and var 2016-03-24 06:38:45 -06:00
Greg Sjaardema
3bb86e417d Update var.c 2016-03-22 07:52:41 -06:00
Greg Sjaardema
362e28948d Add hashmap for quick retrieval of dim and var 2016-03-22 07:29:00 -06:00
Ward Fisher
fb2ff0c24b Refactored old ENOERR code into NC_NOERR error code in libsrc. This is done in support of https://github.com/Unidata/netcdf-c/issues/213. 2016-03-07 10:58:02 -07:00
Ward Fisher
e10ad6bed8 Removing duplicated errors, in support of https://github.com/Unidata/netcdf-c/issues/213 2016-03-07 10:48:04 -07:00
Ward Fisher
b19b807e8b Working around a couple of problematic calls to fstat in support of https://github.com/Unidata/netcdf-c/issues/188 . No idea why these were a problem in VS14 (Visual Studio 2015) and not in VS12 (Visual Studio 2013). It's possible there are other, similar issues out there. We'll see what turns up when we run all the tests. These changes were tested against nc_test4/tst_large2.c 2016-03-02 13:03:29 -07:00
Ward Fisher
a81f150e88 Modified fstat call in fgrow2 to use filelengthi64 on Windows, where available. 2016-03-02 10:51:11 -07:00
Ward Fisher
fbdea5c4a0 Working in support of https://github.com/Unidata/netcdf-c/issues/188 . Exploratory work. 2016-02-29 15:08:09 -07:00
Ward Fisher
0ee9a4f59e Further cleanup of generated files. 2016-01-22 12:04:43 -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
Ward Fisher
023356ba9b Fixed typos. 2015-12-29 12:39:35 -07:00
Ward Fisher
cee769cc1e Converting CHAR_IS_SIGNED over to autoconf-style __CHAR_UNSIGNED__ 2015-12-28 21:27:27 +00:00
Ward Fisher
8e4a8f4225 Chasing down implicit char cast which rounds a value to 0 when a negative value is cast to a different unsigned type. 2015-12-28 20:24:56 +00:00
Ward Fisher
bd92caa176 More changes towards fixing the issue where the file is read incorrectly. 2015-12-28 17:36:05 +00:00
Ward Fisher
103863ca24 More architecture-specific fenceposting. 2015-12-24 16:42:54 +00:00
Ward Fisher
d71e9ed5f6 Fenceposting the bug fixes with __arm__ ifdefs. 2015-12-24 09:35:32 -07:00
Ward Fisher
925da14d2a Some additional errors reared up after fixing the main frustrating one. Working towards fixing them. 2015-12-24 01:37:42 +00:00
Ward Fisher
6eec405e13 Added explit cast from signed in ncx.m4 to address https://github.com/Unidata/netcdf-c/issues/159. It is likely overly broad; I will refine it once I've had a chance to read up on m4. 2015-12-23 22:16:49 +00: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
bf02ded6f4 Merge branch 'ncf344' of https://github.com/Unidata/netcdf-c into ncf344 2015-11-02 12:15:19 -07:00
Ward Fisher
acc4993b19 Changes to modified files. 2015-11-02 12:14:19 -07:00
Ward Fisher
c87d792cfc Applied the patch provided by Wei-keng Liao in support of [NCF-344]. 2015-10-30 16:45:32 +00:00
Ward Fisher
f7b7996f7e Added brackets for clarity around some code in question. 2015-10-28 11:04:34 -06:00
Ward Fisher
7c8ce85a5f Removing a couple of generated files from version control. 2015-10-22 13:03:31 -06:00
Ward Fisher
36b6230b3d Working on debugging cdf-5 branch on Windows. Currently, nctest fails. 2015-10-21 16:13:31 -06:00
Ward Fisher
5e9fe31ae7 Updating .m4 file. 2015-10-21 15:04:59 -06:00
Ward Fisher
0d1f013bb7 Removed generated ncx.c file from version control. 2015-10-21 13:41:50 -06:00
Ward Fisher
adbdf84fdb Regenerated ncx.c 2015-10-21 13:34:20 -06:00
Ward Fisher
225050c4b7 Tweaked .m4 file for a specific case. 2015-10-21 19:11:22 +00:00
Ward Fisher
4aca5795ac Regenerated source files from m4 to make things work on Windows. 2015-10-21 11:27:41 -06:00
Ward Fisher
519a56019f Merge branch 'fix-typos' of https://github.com/tbeu/netcdf-c into tbeu-fix-typos 2015-10-16 14:16:09 -06:00
Dennis Heimbigner
cd7a06b193 pull request 2015-10-12 17:09:37 -06:00
dmh
39ccdc5ee3 conflicts 2015-10-11 13:43:19 -06:00
dmh
ed57a337ec add ptrdiff_t checks 2015-10-11 13:35:44 -06:00