[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 15 insertions, 14 deletions

diff --git a/src/H5HF.c b/src/H5HF.c
index 23e15c2..801fa8c 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -99,7 +99,7 @@ H5FL_DEFINE_STATIC(H5HF_t);
 herr_t
 H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_op_read)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Perform "read", using memcpy() */
     HDmemcpy(op_data, obj, obj_len);
@@ -124,7 +124,7 @@ H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
 herr_t
 H5HF_op_write(const void *obj, size_t obj_len, void *op_data)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_op_write)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Perform "write", using memcpy() */
     HDmemcpy((void *)obj, op_data, obj_len);    /* Casting away const OK -QAK */
@@ -155,7 +155,7 @@ H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
     haddr_t fh_addr;            /* Heap header address */
     H5HF_t *ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_create, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 #ifdef QAK
 HDfprintf(stderr, "%s: Called\n", FUNC);
 #endif /* QAK */
@@ -225,7 +225,7 @@ H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
     H5HF_hdr_t *hdr = NULL;     /* The fractal heap header information */
     H5HF_t *ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_open, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /*
      * Check arguments.
@@ -293,7 +293,7 @@ done:
 herr_t
 H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5HF_get_id_len)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /*
      * Check arguments.
@@ -324,7 +324,7 @@ H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
 herr_t
 H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr_p)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5HF_get_heap_addr)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /*
      * Check arguments.
@@ -360,7 +360,8 @@ H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj,
     H5HF_hdr_t *hdr = NULL;                  /* The fractal heap header information */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5HF_insert, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
+
 #ifdef QAK
 HDfprintf(stderr, "%s: size = %Zu\n", FUNC, size);
 #endif /* QAK */
@@ -433,7 +434,7 @@ H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *_id, size_t *obj_len_p)
     uint8_t id_flags;                   /* Heap ID flag bits */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_get_obj_len, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /*
      * Check arguments.
@@ -501,7 +502,7 @@ H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *_id, void *obj/*out*/)
     uint8_t id_flags;                   /* Heap ID flag bits */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_read, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /*
      * Check arguments.
@@ -579,7 +580,7 @@ H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *_id, hbool_t UNUSED *id_changed,
     uint8_t id_flags;                   /* Heap ID flag bits */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_write, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 #ifdef QAK
 HDfprintf(stderr, "%s: Called\n", FUNC);
 #endif /* QAK */
@@ -654,7 +655,7 @@ H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *_id, H5HF_operator_t op,
     uint8_t id_flags;                   /* Heap ID flag bits */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_op, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /*
      * Check arguments.
@@ -719,7 +720,7 @@ H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *_id)
     uint8_t id_flags;                   /* Heap ID flag bits */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_remove, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 #ifdef QAK
 HDfprintf(stderr, "%s: Called\n", FUNC);
 #endif /* QAK */
@@ -787,7 +788,7 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
     haddr_t heap_addr = HADDR_UNDEF;    /* Address of heap (for deletion) */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_close, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /*
      * Check arguments.
@@ -891,7 +892,7 @@ H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
     H5HF_hdr_t *hdr = NULL;             /* The fractal heap header information */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5HF_delete, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /*
      * Check arguments.