summaryrefslogtreecommitdiffstats
path: root/src/H5G.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/H5G.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/H5G.c')
-rw-r--r--src/H5G.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5G.c b/src/H5G.c
index de501ea..bfad876 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -898,8 +898,8 @@ done:
} /* end if */
if(grp != NULL) {
if(grp->shared != NULL)
- (void)H5FL_FREE(H5G_shared_t, grp->shared);
- (void)H5FL_FREE(H5G_t,grp);
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
+ grp = H5FL_FREE(H5G_t, grp);
} /* end if */
} /* end if */
@@ -1020,7 +1020,7 @@ H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
/* Add group to list of open objects in file */
if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, FALSE) < 0) {
- (void)H5FL_FREE(H5G_shared_t, grp->shared);
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
} /* end if */
@@ -1057,7 +1057,7 @@ done:
if(!ret_value && grp) {
H5O_loc_free(&(grp->oloc));
H5G_name_free(&(grp->path));
- (void)H5FL_FREE(H5G_t,grp);
+ grp = H5FL_FREE(H5G_t, grp);
} /* end if */
FUNC_LEAVE_NOAPI(ret_value)
@@ -1109,7 +1109,7 @@ done:
if(obj_opened)
H5O_close(&(grp->oloc));
if(grp->shared)
- (void)H5FL_FREE(H5G_shared_t, grp->shared);
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
} /* end if */
FUNC_LEAVE_NOAPI(ret_value)
@@ -1151,7 +1151,7 @@ H5G_close(H5G_t *grp)
HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't remove group from list of open objects")
if(H5O_close(&(grp->oloc)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
- (void)H5FL_FREE(H5G_shared_t, grp->shared);
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
} else {
/* Decrement the ref. count for this object in the top file */
if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
@@ -1173,11 +1173,11 @@ H5G_close(H5G_t *grp)
} /* end else */
if(H5G_name_free(&(grp->path)) < 0) {
- (void)H5FL_FREE(H5G_t, grp);
+ grp = H5FL_FREE(H5G_t, grp);
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't free group entry name")
} /* end if */
- (void)H5FL_FREE(H5G_t, grp);
+ grp = H5FL_FREE(H5G_t, grp);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1208,8 +1208,8 @@ H5G_free(H5G_t *grp)
HDassert(grp && grp->shared);
- (void)H5FL_FREE(H5G_shared_t, grp->shared);
- (void)H5FL_FREE(H5G_t, grp);
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
+ grp = H5FL_FREE(H5G_t, grp);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1562,7 +1562,7 @@ H5G_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_free_visit_visited)
- (void)H5FL_FREE(H5_obj_t, item);
+ item = H5FL_FREE(H5_obj_t, item);
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5G_free_visit_visited() */