summaryrefslogtreecommitdiffstats
path: root/src/H5Dchunk.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-20 18:26:41 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-20 18:26:41 (GMT)
commit92fd980ca9f16ce688f67a1ae04f129dfa3aacf1 (patch)
tree1a15cc9d6329b3fcc312d288ac632d9223b10b63 /src/H5Dchunk.c
parent987bc92a01dfe013abced01378ee7e4b3173c797 (diff)
downloadhdf5-92fd980ca9f16ce688f67a1ae04f129dfa3aacf1.zip
hdf5-92fd980ca9f16ce688f67a1ae04f129dfa3aacf1.tar.gz
hdf5-92fd980ca9f16ce688f67a1ae04f129dfa3aacf1.tar.bz2
[svn-r18595] Description:
Clean up compiler warnings Tested on: Mac OS X/32 10.6.3 (amazon) w/debug (too minor to require h5committest)
Diffstat (limited to 'src/H5Dchunk.c')
-rw-r--r--src/H5Dchunk.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 03a3785..ce7deb5 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -893,7 +893,7 @@ H5D_chunk_xfree(void *chk, const H5O_pline_t *pline)
if(pline->nused > 0)
H5MM_xfree(chk);
else
- (void)H5FL_BLK_FREE(chunk, chk);
+ chk = H5FL_BLK_FREE(chunk, chk);
} /* end if */
FUNC_LEAVE_NOAPI(NULL)
@@ -937,7 +937,7 @@ H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata)
(void)H5S_close(chunk_info->mspace);
/* Free the actual chunk info */
- (void)H5FL_FREE(H5D_chunk_info_t, chunk_info);
+ chunk_info = H5FL_FREE(H5D_chunk_info_t, chunk_info);
FUNC_LEAVE_NOAPI(0)
} /* H5D_free_chunk_info() */
@@ -1369,14 +1369,14 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
/* Create a dataspace for the chunk */
if((fspace = H5S_create_simple(fm->f_ndims,fm->chunk_dim,NULL))==NULL) {
- (void)H5FL_FREE(H5D_chunk_info_t,chunk_info);
+ chunk_info = H5FL_FREE(H5D_chunk_info_t, chunk_info);
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "unable to create dataspace for chunk")
} /* end if */
/* De-select the chunk space */
if(H5S_select_none(fspace) < 0) {
(void)H5S_close(fspace);
- (void)H5FL_FREE(H5D_chunk_info_t,chunk_info);
+ chunk_info = H5FL_FREE(H5D_chunk_info_t, chunk_info);
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select dataspace")
} /* end if */
@@ -2506,7 +2506,7 @@ H5D_chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
--rdcc->nused;
/* Free */
- (void)H5FL_FREE(H5D_rdcc_ent_t, ent);
+ ent = H5FL_FREE(H5D_rdcc_ent_t, ent);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -3885,7 +3885,7 @@ done:
while(tmp_stack) {
/* Free the stack node and advance the stack pointer */
tmp_stack = tmp_stack->next;
- (void)H5FL_FREE(H5D_chunk_prune_stack_t, fill_stack);
+ fill_stack = H5FL_FREE(H5D_chunk_prune_stack_t, fill_stack);
fill_stack = tmp_stack;
} /* end while */
@@ -3894,7 +3894,7 @@ done:
while(tmp_stack) {
/* Free the stack node and advance the stack pointer */
tmp_stack = tmp_stack->next;
- (void)H5FL_FREE(H5D_chunk_prune_stack_t, udata.rm_stack);
+ udata.rm_stack = H5FL_FREE(H5D_chunk_prune_stack_t, udata.rm_stack);
udata.rm_stack = tmp_stack;
} /* end while */