summaryrefslogtreecommitdiffstats
path: root/src/H5Shyper.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/H5Shyper.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/H5Shyper.c')
-rw-r--r--src/H5Shyper.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 0565cf3..74402b1 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -1543,7 +1543,7 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
} /* end while */
/* Free this span info */
- (void)H5FL_FREE(H5S_hyper_span_info_t, span_info);
+ span_info = H5FL_FREE(H5S_hyper_span_info_t, span_info);
} /* end if */
done:
@@ -1586,7 +1586,7 @@ H5S_hyper_free_span (H5S_hyper_span_t *span)
} /* end if */
/* Free this span */
- (void)H5FL_FREE(H5S_hyper_span_t, span);
+ span = H5FL_FREE(H5S_hyper_span_t, span);
done:
FUNC_LEAVE_NOAPI(ret_value);
@@ -3174,30 +3174,29 @@ H5S_hyper_is_regular(const H5S_t *space)
* when closing some other data space.
--------------------------------------------------------------------------*/
herr_t
-H5S_hyper_release (H5S_t *space)
+H5S_hyper_release(H5S_t *space)
{
- herr_t ret_value=SUCCEED;
+ herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5S_hyper_release, FAIL);
+ FUNC_ENTER_NOAPI(H5S_hyper_release, FAIL)
/* Check args */
- assert (space && H5S_SEL_HYPERSLABS==H5S_GET_SELECT_TYPE(space));
+ HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
/* Reset the number of points selected */
- space->select.num_elem=0;
+ space->select.num_elem = 0;
/* Release irregular hyperslab information */
- if(space->select.sel_info.hslab->span_lst!=NULL) {
- if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst)<0)
- HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans");
+ if(space->select.sel_info.hslab->span_lst != NULL) {
+ if(H5S_hyper_free_span_info(space->select.sel_info.hslab->span_lst) < 0)
+ HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans")
} /* end if */
/* Release space for the hyperslab selection information */
- (void)H5FL_FREE(H5S_hyper_sel_t, space->select.sel_info.hslab);
- space->select.sel_info.hslab=NULL;
+ space->select.sel_info.hslab = H5FL_FREE(H5S_hyper_sel_t, space->select.sel_info.hslab);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5S_hyper_release() */