summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-05-18 03:29:30 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-05-18 03:29:30 (GMT)
commita9d99b0539a1bb858e435e46adca138a8072a79e (patch)
tree2431f36aa93e8e634b2cbb4a77a7355b236f7ed1
parentd55f3671dc959f223bff005ed6bef7d0a583fc51 (diff)
downloadhdf5-a9d99b0539a1bb858e435e46adca138a8072a79e.zip
hdf5-a9d99b0539a1bb858e435e46adca138a8072a79e.tar.gz
hdf5-a9d99b0539a1bb858e435e46adca138a8072a79e.tar.bz2
[svn-r25198] Description:
Bring r25197 from trunk to 1.8 branch: Bring changes from hdf5_1_8_coverity branch back to trunk: r20878: Issue 76: Check if H5Tget_nmembers(type) fails and simply return(FALSE). Also move printf to after check. r20880: Issue 192: Create ret_val var set to -1. Add out label for failures to jump to, return ret_val at bottom. r20882: Fixes for coverity: 1) bug #1679: remove dead code in test/mf.c 2) bug #1680: remove dead code in tools/lib/h5diff_dset.c r20883: Fix coverity issue 585 Description: Changed variable "c" in processStrData in h5import.c to an int, to match fgetc return value, and removed call to feof, instead checking if c == EOF. Tested on: MacOSX/64 10.9.3 (amazon) w/C++, FORTRAN & parallel (too minor to require h5committest)
-rw-r--r--hl/test/test_image.c4
-rw-r--r--src/H5Dchunk.c5
-rw-r--r--src/H5Dmpio.c2
-rw-r--r--tools/h5import/h5import.c9
-rw-r--r--tools/h5ls/h5ls.c9
-rw-r--r--tools/lib/h5diff_dset.c6
6 files changed, 12 insertions, 23 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 3109a36..5740d4b 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -783,9 +783,9 @@ out:
*-------------------------------------------------------------------------
*/
-static int read_data( const char* fname, /*IN*/
+static int read_data(const char* fname, /*IN*/
hsize_t *width, /*OUT*/
- hsize_t *height /*OUT*/ )
+ hsize_t *height /*OUT*/)
{
int i, n;
int color_planes;
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 43d140e..0a59ca5 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -385,10 +385,9 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz
if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, data_size, dxpl_id, buf) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
-
done:
FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5D__chunk_direct_write() */
/*-------------------------------------------------------------------------
@@ -2798,7 +2797,7 @@ void *
H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
hbool_t relax)
{
- const H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */
+ const H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */
const H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info - always equal to the pline passed to H5D__chunk_alloc */
const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */
const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index c294e42..a5e8903 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -1308,8 +1308,6 @@ done:
} /* end H5D__multi_chunk_collective_io */
-
-
/*-------------------------------------------------------------------------
* Function: H5D__inter_collective_io
*
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 74c67b9..96fb6f9 100644
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -874,12 +874,9 @@ static int processStrData(FILE *strm, struct Input *in, hid_t file_id)
*-------------------------------------------------------------------------
*/
- while (!HDfeof(strm)) {
- c = HDfgetc(strm);
-
+ while(EOF != (c = HDfgetc(strm)))
if (c == 10) /* eol */
nlines++;
- }
if (!nlines)
return 0;
@@ -940,9 +937,7 @@ static int processStrData(FILE *strm, struct Input *in, hid_t file_id)
line = 0;
- while (!HDfeof(strm)) {
- c = HDfgetc(strm);
-
+ while(EOF != (c = HDfgetc(strm))) {
str[i] = (char)c;
i++;
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 257d4d1..d8768fb 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -820,8 +820,6 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
* Programmer: Robb Matzke
* Thursday, November 5, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static hbool_t
@@ -836,8 +834,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
if(H5T_COMPOUND != H5Tget_class(type))
return FALSE;
- nmembs = H5Tget_nmembers(type);
- if(nmembs <= 0)
+ if((nmembs = H5Tget_nmembers(type)) < 0)
return FALSE;
h5tools_str_append(buffer, "struct {");
@@ -859,6 +856,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
size = H5Tget_size(type);
h5tools_str_append(buffer, "\n%*s} %lu byte%s",
ind, "", (unsigned long)size, 1==size?"":"s");
+
return TRUE;
}
@@ -887,8 +885,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
if(H5T_ENUM != H5Tget_class(type))
return FALSE;
- nmembs = H5Tget_nmembers(type);
- if(nmembs < 0)
+ if((nmembs = H5Tget_nmembers(type)) < 0)
return FALSE;
super = H5Tget_super(type);
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index aea2192..157978d 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -433,13 +433,13 @@ hsize_t diff_datasetid( hid_t did1,
HDassert(sm_nbytes > 0);
} /* end for */
- /* malloc return code should be verified.
+ /* malloc return code should be verified.
* If fail, need to handle the error.
* This else branch should be recoded as a separate function.
* Note that there are many "goto error" within this branch
* that fails to address freeing other objects created here.
- * E.g., sm_space.
- */
+ * E.g., sm_space.
+ */
sm_buf1 = HDmalloc((size_t)sm_nbytes);
HDassert(sm_buf1);
sm_buf2 = HDmalloc((size_t)sm_nbytes);