[svn-r23948] Bring revisions #23670 - 23713 from trunk to revise_chunks.

h5committested.

1 files changed, 22 insertions, 23 deletions

diff --git a/src/H5HG.c b/src/H5HG.c
index 5b9c53c..4bb8670 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -191,7 +191,7 @@ HDmemset(heap->chunk, 0, size);
 
     /* The freespace object */
     heap->obj[0].size = size - H5HG_SIZEOF_HDR(f);
-    assert(H5HG_ISALIGNED(heap->obj[0].size));
+    HDassert(H5HG_ISALIGNED(heap->obj[0].size));
     heap->obj[0].nrefs = 0;
     heap->obj[0].begin = p;
     UINT16ENCODE(p, 0);	/*object ID*/
@@ -360,29 +360,28 @@ H5HG_alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr)
         heap->obj[0].size = 0;
         heap->obj[0].begin = NULL;
     } /* end if */
-    //else if(heap->obj[0].size - need >= H5HG_SIZEOF_OBJHDR(f)) {
-    else if(heap->obj[0].size >= need + H5HG_SIZEOF_OBJHDR(f)) {
-        /*
-         * Some free space remains and it's larger than a heap object header,
-         * so write the new free heap object header to the heap.
-         */
-        heap->obj[0].size -= need;
-        heap->obj[0].begin += need;
-        p = heap->obj[0].begin;
-        UINT16ENCODE(p, 0);	/*id*/
-        UINT16ENCODE(p, 0);	/*nrefs*/
-        UINT32ENCODE(p, 0);	/*reserved*/
-        H5F_ENCODE_LENGTH (f, p, heap->obj[0].size);
-        HDassert(H5HG_ISALIGNED(heap->obj[0].size));
+    else if(heap->obj[0].size-need >= H5HG_SIZEOF_OBJHDR (f)) {
+	/*
+	 * Some free space remains and it's larger than a heap object header,
+	 * so write the new free heap object header to the heap.
+	 */
+	heap->obj[0].size -= need;
+	heap->obj[0].begin += need;
+	p = heap->obj[0].begin;
+	UINT16ENCODE(p, 0);	/*id*/
+	UINT16ENCODE(p, 0);	/*nrefs*/
+	UINT32ENCODE(p, 0);	/*reserved*/
+	H5F_ENCODE_LENGTH (f, p, heap->obj[0].size);
+	HDassert(H5HG_ISALIGNED(heap->obj[0].size));
     } /* end else-if */
     else {
-        /*
-         * Some free space remains but it's smaller than a heap object header,
-         * so we don't write the header.
-         */
-        heap->obj[0].size -= need;
-        heap->obj[0].begin += need;
-        HDassert(H5HG_ISALIGNED(heap->obj[0].size));
+	/*
+	 * Some free space remains but it's smaller than a heap object header,
+	 * so we don't write the header.
+	 */
+	heap->obj[0].size -= need;
+	heap->obj[0].begin += need;
+	HDassert(H5HG_ISALIGNED(heap->obj[0].size));
     }
 
     /* Mark the heap as dirty */
@@ -476,7 +475,7 @@ HDmemset(new_chunk + heap->size, 0, need);
     UINT16ENCODE(p, 0);	/*nrefs*/
     UINT32ENCODE(p, 0);	/*reserved*/
     H5F_ENCODE_LENGTH(f, p, heap->obj[0].size);
-    assert(H5HG_ISALIGNED(heap->obj[0].size));
+    HDassert(H5HG_ISALIGNED(heap->obj[0].size));
 
     /* Resize the heap in the cache */
     if(H5AC_resize_entry(heap, heap->size) < 0)