[svn-r21919] Description:

    Refactor function name macros and simplify the FUNC_ENTER macros, to clear
away the cruft and prepare for further cleanups.

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug, production & parallel

1 files changed, 17 insertions, 17 deletions

diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index 23db587..ed17c6f 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -161,7 +161,7 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     switch(H5I_get_type(loc_id)) {
         case H5I_FILE:
@@ -275,7 +275,7 @@ H5G_loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_copy, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(dst);
@@ -309,7 +309,7 @@ H5G_loc_reset(H5G_loc_t *loc)
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_reset, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -342,7 +342,7 @@ H5G_loc_free(H5G_loc_t *loc)
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_free, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -378,7 +378,7 @@ H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name,
     H5G_loc_fnd_t *udata = (H5G_loc_fnd_t *)_udata;   /* User data passed in */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5G_loc_find_cb)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid object */
     if(obj_loc == NULL)
@@ -415,7 +415,7 @@ H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc/*out*/,
     H5G_loc_fnd_t udata;                /* User data for traversal callback */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_find, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -460,7 +460,7 @@ H5G_loc_find_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
     hbool_t obj_exists = FALSE;         /* Whether the object exists (unused) */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5G_loc_find_by_idx_cb)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
     if(obj_loc == NULL)
@@ -521,7 +521,7 @@ H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
     H5G_loc_fbi_t udata;                /* User data for traversal callback */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_find_by_idx, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -564,7 +564,7 @@ H5G_loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
     H5O_link_t  lnk;                    /* Link for object to insert */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_insert, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(grp_loc);
@@ -613,7 +613,7 @@ H5G_loc_exists_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
 {
     H5G_loc_exists_t *udata = (H5G_loc_exists_t *)_udata;   /* User data passed in */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_loc_exists_cb)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check if the name in this group resolved to a valid object */
     if(obj_loc == NULL)
@@ -651,7 +651,7 @@ H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl
     H5G_loc_exists_t udata;     /* User data for traversal callback */
     htri_t ret_value;           /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_exists, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -691,7 +691,7 @@ H5G_loc_info_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name, const
     H5G_loc_info_t *udata = (H5G_loc_info_t *)_udata;   /* User data passed in */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5G_loc_info_cb)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
     if(obj_loc == NULL)
@@ -730,7 +730,7 @@ H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t
     H5G_loc_info_t udata;               /* User data for traversal callback */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_info, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -772,7 +772,7 @@ H5G_loc_set_comment_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
     htri_t exists;                      /* Whether a "comment" message already exists */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5G_loc_set_comment_cb)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
     if(obj_loc == NULL)
@@ -824,7 +824,7 @@ H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment,
     H5G_loc_sc_t udata;         /* User data for traversal callback */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_set_comment, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);
@@ -863,7 +863,7 @@ H5G_loc_get_comment_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
     H5O_name_t comment;                 /* Object header "comment" message */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5G_loc_get_comment_cb)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check if the name in this group resolved to a valid link */
     if(obj_loc == NULL)
@@ -915,7 +915,7 @@ H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment/*out*/,
     H5G_loc_gc_t udata;         /* User data for traversal callback */
     ssize_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_loc_get_comment, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args. */
     HDassert(loc);