diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-11-01 16:01:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-11-01 16:01:37 (GMT) |
| commit | b9d042d2d273cacff8ecfeecd5e1bd75a6da7f3b (patch) | |
| tree | 846e6e81be5ccaa721d2c94ef98771de52b0f48b /src/H5FDfamily.c | |
| parent | 51c5bf8aa76cf378ccd59b02247fb7cd0d9b3eaf (diff) | |
| download | hdf5-b9d042d2d273cacff8ecfeecd5e1bd75a6da7f3b.zip hdf5-b9d042d2d273cacff8ecfeecd5e1bd75a6da7f3b.tar.gz hdf5-b9d042d2d273cacff8ecfeecd5e1bd75a6da7f3b.tar.bz2 | |
[svn-r22998] Description:
Clean up warnings and bring changes from Coverity branch back to trunk:
r20451:
Fixed coverity 810
r20454:
Purpose: Fix coverity issue 816
Description: Modified various file drivers to always check the return value from
H5P_get_driver_info.
r20455:
Purpose: Cleanup fix for coverity issue 816
Description: Removed redundant check for "fa" in H5FD_core_open.
Tested on:
Mac OSX/64 10.8.2 (amazon) w/debug
(Too minor to require h5committest)
Diffstat (limited to 'src/H5FDfamily.c')
| -rw-r--r-- | src/H5FDfamily.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index f051269..dc535a2 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -675,8 +675,8 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list") - fa = (H5FD_family_fapl_t *)H5P_get_driver_info(plist); - HDassert(fa); + if(NULL == (fa = (H5FD_family_fapl_t *)H5P_get_driver_info(plist))) + HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info") /* Check for new family file size. It's used by h5repart only. */ if(H5P_exist_plist(plist, H5F_ACS_FAMILY_NEWSIZE_NAME) > 0) { |