diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-10 19:53:38 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-10 19:53:38 (GMT) |
commit | d517c77bc0fe9c9dbfd013d720e1533289decd9f (patch) | |
tree | 97f369888eccbb8455ebbc2fd6de9f6834f6b433 /src/H5Ofill.c | |
parent | fc7993a9f068319ed35f13fd153feeb5da3d86a7 (diff) | |
download | hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.zip hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.tar.gz hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.tar.bz2 |
[svn-r15610] Description:
Bring r15609 back from trunk:
Omnibus compiler warning cleanup & some formatting happiness.
Tested on:
Mac OS X/32 10.5.4 (amazon)
Too minor to require h5committest
Diffstat (limited to 'src/H5Ofill.c')
-rw-r--r-- | src/H5Ofill.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 613a6fd..43ec1a4 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -275,7 +275,7 @@ done: if(!ret_value && fill) { if(fill->buf) H5MM_xfree(fill->buf); - H5FL_FREE(H5O_fill_t, fill); + (void)H5FL_FREE(H5O_fill_t, fill); } /* end if */ FUNC_LEAVE_NOAPI(ret_value) @@ -335,7 +335,7 @@ done: if(!ret_value && fill) { if(fill->buf) H5MM_xfree(fill->buf); - H5FL_FREE(H5O_fill_t, fill); + (void)H5FL_FREE(H5O_fill_t, fill); } /* end if */ FUNC_LEAVE_NOAPI(ret_value) @@ -507,7 +507,7 @@ H5O_fill_copy(const void *_src, void *_dst) /* Copy data type of fill value */ if(src->type) { if(NULL == (dst->type = H5T_copy(src->type, H5T_COPY_TRANSIENT))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy fill value data type") + HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "can't copy datatype") } /* end if */ else dst->type = NULL; @@ -556,7 +556,7 @@ H5O_fill_copy(const void *_src, void *_dst) H5I_dec_ref(src_id, FALSE); H5I_dec_ref(dst_id, FALSE); if(bkg_buf) - H5FL_BLK_FREE(type_conv, bkg_buf); + (void)H5FL_BLK_FREE(type_conv, bkg_buf); HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, NULL, "datatype conversion failed") } /* end if */ @@ -564,7 +564,7 @@ H5O_fill_copy(const void *_src, void *_dst) H5I_dec_ref(src_id, FALSE); H5I_dec_ref(dst_id, FALSE); if(bkg_buf) - H5FL_BLK_FREE(type_conv, bkg_buf); + (void)H5FL_BLK_FREE(type_conv, bkg_buf); } /* end if */ } /* end if */ } /* end if */ @@ -581,7 +581,7 @@ done: if(dst->type) H5T_close(dst->type); if(!_dst) - H5FL_FREE(H5O_fill_t, dst); + (void)H5FL_FREE(H5O_fill_t, dst); } /* end if */ FUNC_LEAVE_NOAPI(ret_value) @@ -783,7 +783,7 @@ H5O_fill_free(void *fill) HDassert(fill); - H5FL_FREE(H5O_fill_t, fill); + (void)H5FL_FREE(H5O_fill_t, fill); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O_fill_free() */ |