diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2016-09-29 20:19:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2016-09-29 20:19:35 (GMT) |
| commit | 30ca70b0969ae0ab63104d7910523818e5385ac6 (patch) | |
| tree | 471b06e9f95379c79b350ec435c49ec525b9e786 /src | |
| parent | a7fb4ede8601e135433ef2d23bf4bbb466d9f58d (diff) | |
| parent | 5a7880183025f56421cf6f2274d9f1ac36f59641 (diff) | |
| download | hdf5-30ca70b0969ae0ab63104d7910523818e5385ac6.zip hdf5-30ca70b0969ae0ab63104d7910523818e5385ac6.tar.gz hdf5-30ca70b0969ae0ab63104d7910523818e5385ac6.tar.bz2 | |
Merge pull request #46 in HDFFV/hdf5 from ~KOZIOL/hdf5:features/warning_cleanups to develop
* commit '5a7880183025f56421cf6f2274d9f1ac36f59641':
Clean up hardcoded constants and check return values better. (Comments from group code review)
Description: Cleanups from Dana's review.
Description: Further warning cleanups: from 667 warnings to 503.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Aint.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index ea90118..66af0ff 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -2106,10 +2106,9 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si HDmemcpy(buf, attr_src->shared->data, attr_src->shared->data_size); /* Allocate background memory */ - if(H5T_path_bkg(tpath_src_mem) || H5T_path_bkg(tpath_mem_dst)) { + if(H5T_path_bkg(tpath_src_mem) || H5T_path_bkg(tpath_mem_dst)) if(NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size))) - HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "memory allocation failed") - } + HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, NULL, "memory allocation failed") /* Convert from source file to memory */ if(H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg_buf, dxpl_id) < 0) |