Merge from develop and 1.12

Comments and whitespace
No cache, select or file-locking changes

1 files changed, 35 insertions, 35 deletions

diff --git a/src/H5HLprfx.c b/src/H5HLprfx.c
index d17e558..fedc11b 100644
--- a/src/H5HLprfx.c
+++ b/src/H5HLprfx.c
@@ -82,31 +82,31 @@ H5FL_DEFINE_STATIC(H5HL_prfx_t);
  */
 BEGIN_FUNC(PKG, ERR, H5HL_prfx_t *, NULL, NULL, H5HL__prfx_new(H5HL_t *heap))
 
-H5HL_prfx_t *prfx = NULL; /* New local heap prefix */
+    H5HL_prfx_t *prfx = NULL; /* New local heap prefix */
 
-/* check arguments */
-HDassert(heap);
+    /* check arguments */
+    HDassert(heap);
 
-/* Allocate new local heap prefix */
-if (NULL == (prfx = H5FL_CALLOC(H5HL_prfx_t)))
-    H5E_THROW(H5E_CANTALLOC, "memory allocation failed for local heap prefix")
+    /* Allocate new local heap prefix */
+    if (NULL == (prfx = H5FL_CALLOC(H5HL_prfx_t)))
+        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for local heap prefix")
 
-/* Increment ref. count on heap data structure */
-if (FAIL == H5HL__inc_rc(heap))
-    H5E_THROW(H5E_CANTINC, "can't increment heap ref. count")
+    /* Increment ref. count on heap data structure */
+    if (FAIL == H5HL__inc_rc(heap))
+        H5E_THROW(H5E_CANTINC, "can't increment heap ref. count")
 
-/* Link the heap & the prefix */
-prfx->heap = heap;
-heap->prfx = prfx;
+    /* Link the heap & the prefix */
+    prfx->heap = heap;
+    heap->prfx = prfx;
 
-/* Set the return value */
-ret_value = prfx;
+    /* Set the return value */
+    ret_value = prfx;
 
-CATCH
-/* Ensure that the prefix memory is deallocated on errors */
-if (!ret_value && prfx != NULL)
-    /* H5FL_FREE always returns NULL so we can't check for errors */
-    prfx = H5FL_FREE(H5HL_prfx_t, prfx);
+    CATCH
+    /* Ensure that the prefix memory is deallocated on errors */
+    if (!ret_value && prfx != NULL)
+        /* H5FL_FREE always returns NULL so we can't check for errors */
+        prfx = H5FL_FREE(H5HL_prfx_t, prfx);
 
 END_FUNC(PKG) /* end H5HL__prfx_new() */
 
@@ -124,25 +124,25 @@ END_FUNC(PKG) /* end H5HL__prfx_new() */
  */
 BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__prfx_dest(H5HL_prfx_t *prfx))
 
-/* check arguments */
-HDassert(prfx);
+    /* check arguments */
+    HDassert(prfx);
 
-/* Check if prefix was initialized */
-if (prfx->heap) {
-    /* Unlink prefix from heap */
-    prfx->heap->prfx = NULL;
+    /* Check if prefix was initialized */
+    if (prfx->heap) {
+        /* Unlink prefix from heap */
+        prfx->heap->prfx = NULL;
 
-    /* Decrement ref. count on heap data structure */
-    if (FAIL == H5HL__dec_rc(prfx->heap))
-        H5E_THROW(H5E_CANTDEC, "can't decrement heap ref. count")
+        /* Decrement ref. count on heap data structure */
+        if (FAIL == H5HL__dec_rc(prfx->heap))
+            H5E_THROW(H5E_CANTDEC, "can't decrement heap ref. count")
 
-    /* Unlink heap from prefix */
-    prfx->heap = NULL;
-} /* end if */
+        /* Unlink heap from prefix */
+        prfx->heap = NULL;
+    } /* end if */
 
-CATCH
-/* Free prefix memory */
-/* H5FL_FREE always returns NULL so we can't check for errors */
-prfx = H5FL_FREE(H5HL_prfx_t, prfx);
+    CATCH
+    /* Free prefix memory */
+    /* H5FL_FREE always returns NULL so we can't check for errors */
+    prfx = H5FL_FREE(H5HL_prfx_t, prfx);
 
 END_FUNC(PKG) /* end H5HL__prfx_dest() */