[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

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() */