diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-10-17 18:41:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-10-17 18:41:42 (GMT) |
| commit | 0324f055660fde2ddbdd928b6b674814a9e53210 (patch) | |
| tree | 9919843f57d954c35f2743c075c460f8cb1f20e5 /src | |
| parent | 1c45b31cc674a38e32a87a168d50249a6875f821 (diff) | |
| download | hdf5-0324f055660fde2ddbdd928b6b674814a9e53210.zip hdf5-0324f055660fde2ddbdd928b6b674814a9e53210.tar.gz hdf5-0324f055660fde2ddbdd928b6b674814a9e53210.tar.bz2 | |
[svn-r22915] Description:
Bring Coverity changes back to trunk:
r20399:
Change parse_command_line to free hand structure on error and only "leave()" at end of main.
r20400:
Purpose: Fix coverity issue 592
Description: Added void cast to call to H5F_sfile_assert_num() in
H5F_term)interface(). There is no need to check the return value of this
function in general, and there would be nothing to do even if it did fail.
r20401:
Added free(src_sizes) and free(src_offset). --gh
Tested on:
Mac OSX/64 10.8.2 (amazon) w/C++, FORTRAN, threadsafe
(too minor for h5committest)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Fprivate.h | 2 | ||||
| -rw-r--r-- | src/H5Fsfile.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index f9df1eb..e1e1b05 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -633,7 +633,7 @@ H5_DLL void H5F_addr_decode_len(size_t addr_len, const uint8_t **pp, haddr_t *ad H5_DLL herr_t H5P_facc_close(hid_t dxpl_id, void *close_data); /* Shared file list related routines */ -H5_DLL herr_t H5F_sfile_assert_num(unsigned n); +H5_DLL void H5F_sfile_assert_num(unsigned n); /* Routines for creating & destroying "fake" file structures */ H5_DLL H5F_t *H5F_fake_alloc(uint8_t sizeof_size); diff --git a/src/H5Fsfile.c b/src/H5Fsfile.c index 95e5ad2..a1c6976 100644 --- a/src/H5Fsfile.c +++ b/src/H5Fsfile.c @@ -46,16 +46,14 @@ H5F_sfile_node_t *H5F_sfile_head_g = NULL; * * Purpose: Sanity checking that shared file list is empty * - * Return: SUCCEED/FAIL + * Return: none (void) * * Programmer: Quincey Koziol * Monday, July 25, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ -herr_t +void H5F_sfile_assert_num(unsigned n) { FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -83,7 +81,7 @@ H5F_sfile_assert_num(unsigned n) HDassert(count == n); } /* end else */ - FUNC_LEAVE_NOAPI(SUCCEED) + FUNC_LEAVE_NOAPI_VOID } /* H5F_sfile_assert_num() */ |