summaryrefslogtreecommitdiffstats
path: root/src/H5HP.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-10 19:53:38 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-10 19:53:38 (GMT)
commitd517c77bc0fe9c9dbfd013d720e1533289decd9f (patch)
tree97f369888eccbb8455ebbc2fd6de9f6834f6b433 /src/H5HP.c
parentfc7993a9f068319ed35f13fd153feeb5da3d86a7 (diff)
downloadhdf5-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/H5HP.c')
-rw-r--r--src/H5HP.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5HP.c b/src/H5HP.c
index 010c93c..2b1fe89 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -382,7 +382,7 @@ done:
if(new_heap!=NULL) {
if(new_heap->heap!=NULL)
H5FL_SEQ_FREE(H5HP_ent_t,new_heap->heap);
- H5FL_FREE(H5HP_t,new_heap);
+ (void)H5FL_FREE(H5HP_t,new_heap);
} /* end if */
} /* end if */
@@ -896,25 +896,25 @@ done:
herr_t
H5HP_close(H5HP_t *heap)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HP_close);
+ FUNC_ENTER_NOAPI_NOFUNC(H5HP_close)
/* Check args */
- assert(heap);
+ HDassert(heap);
/* Check internal consistency */
/* (Pre-condition) */
- assert(heap->nobjs<heap->nalloc);
- assert(heap->heap);
- assert((heap->type==H5HP_MAX_HEAP && heap->heap[0].val==INT_MAX) ||
- (heap->type==H5HP_MIN_HEAP && heap->heap[0].val==INT_MIN));
- assert(heap->heap[0].obj==NULL);
+ HDassert(heap->nobjs < heap->nalloc);
+ HDassert(heap->heap);
+ HDassert((heap->type == H5HP_MAX_HEAP && heap->heap[0].val == INT_MAX) ||
+ (heap->type == H5HP_MIN_HEAP && heap->heap[0].val == INT_MIN));
+ HDassert(NULL == heap->heap[0].obj);
/* Free internal structures for heap */
- H5FL_SEQ_FREE(H5HP_ent_t,heap->heap);
+ H5FL_SEQ_FREE(H5HP_ent_t, heap->heap);
/* Free actual heap object */
- H5FL_FREE(H5HP_t,heap);
+ (void)H5FL_FREE(H5HP_t, heap);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5HP_close() */