summaryrefslogtreecommitdiffstats
path: root/src/H5Ofill.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-10 19:10:41 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-10 19:10:41 (GMT)
commitc465e18a68f2a77550d93366a5b6c8fac2e24502 (patch)
treebd3649f75f1507040b68d8e15c63333600816360 /src/H5Ofill.c
parent068620ea815d8590982069cfb6374e07d3c8e1e6 (diff)
downloadhdf5-c465e18a68f2a77550d93366a5b6c8fac2e24502.zip
hdf5-c465e18a68f2a77550d93366a5b6c8fac2e24502.tar.gz
hdf5-c465e18a68f2a77550d93366a5b6c8fac2e24502.tar.bz2
[svn-r15609] Description:
Omnibus compiler warning cleanup & some reformatting also. 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.c14
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() */