diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-16 04:44:13 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-16 04:44:13 (GMT) |
| commit | 164b4c75341ee4aa31dcd47c189e415a36ae35e2 (patch) | |
| tree | 121120c9d2df2d601730e4c371afbf5f82004f92 /tools/lib/h5diff.c | |
| parent | 288c7760a4a55d56df7a9019a8522625e305b9b7 (diff) | |
| download | hdf5-164b4c75341ee4aa31dcd47c189e415a36ae35e2.zip hdf5-164b4c75341ee4aa31dcd47c189e415a36ae35e2.tar.gz hdf5-164b4c75341ee4aa31dcd47c189e415a36ae35e2.tar.bz2 | |
[svn-r24804] Description:
Brought changes from Coverity branch back to trunk, and cleaned up misc.
other warnings & formatting issues:
r20833:
Fixed Coverity 667 and 668 with real integer overflow tests this time.
r20834:
Use HDstrncpy and HDstrncat. --gh
r20835:
Change to use strncpy - use base_len + 1 for line 156, use HDstrlen(path) + 1 for line 159
r20836:
Fixed coverity 585 by casting output of fgetc() to a char.
r20837:
Changed sprintf calls to snprintf with size 1 less than the allocated buffer to address coverity issue #967.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
(too minor to require h5committest)
Diffstat (limited to 'tools/lib/h5diff.c')
| -rw-r--r-- | tools/lib/h5diff.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index ab21bfd..884a85d 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -1096,7 +1096,6 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, char * grp2_path = ""; char * obj1_fullpath = NULL; char * obj2_fullpath = NULL; - h5trav_type_t objtype; diff_args_t argdata; size_t idx1 = 0; size_t idx2 = 0; @@ -1163,7 +1162,6 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, { if( table->objs[i].flags[0] && table->objs[i].flags[1]) { - objtype = table->objs[i].type; /* make full path for obj1 */ obj1_fullpath = (char*)HDcalloc (HDstrlen(grp1_path) + strlen (table->objs[i].name) + 1, sizeof (char)); HDstrcpy(obj1_fullpath, grp1_path); |