[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, 21 insertions, 21 deletions

diff --git a/src/H5Z.c b/src/H5Z.c
index e04124e..3bb3a44 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -81,7 +81,7 @@ H5Z_init_interface (void)
 {
     herr_t	ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5Z_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5_HAVE_FILTER_DEFLATE
     if (H5Z_register (H5Z_DEFLATE)<0)
@@ -224,7 +224,7 @@ H5Zregister(const void *cls)
     H5Z_class2_t        cls_new;                /* Translated class struct */
     herr_t              ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_API(H5Zregister, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "*x", cls);
 
     /* Check args */
@@ -302,7 +302,7 @@ H5Z_register (const H5Z_class2_t *cls)
     size_t	i;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_register, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cls);
     HDassert(cls->id >= 0 && cls->id <= H5Z_FILTER_MAX);
@@ -368,7 +368,7 @@ H5Zunregister(H5Z_filter_t id)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API(H5Zunregister, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "Zf", id);
 
     /* Check args */
@@ -407,7 +407,7 @@ H5Z_unregister (H5Z_filter_t id)
     size_t i;                   /* Local index variable */
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_unregister,FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     assert (id>=0 && id<=H5Z_FILTER_MAX);
 
@@ -453,7 +453,7 @@ H5Zfilter_avail(H5Z_filter_t id)
     size_t i;                   /* Local index variable */
     htri_t ret_value=FALSE;     /* Return value */
 
-    FUNC_ENTER_API(H5Zfilter_avail, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "Zf", id);
 
     /* Check args */
@@ -498,7 +498,7 @@ H5Z_prelude_callback(const H5O_pline_t *pline, hid_t dcpl_id, hid_t type_id,
     size_t          u;                      /* Local index variable */
     htri_t          ret_value = TRUE;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5Z_prelude_callback)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(pline->nused > 0);
 
@@ -583,7 +583,7 @@ H5Z_prepare_prelude_callback_dcpl(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type
     hid_t space_id = -1;            /* ID for dataspace describing chunk */
     herr_t ret_value = SUCCEED;     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5Z_prepare_prelude_callback_dcpl)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(H5I_GENPROP_LST == H5I_get_type(dcpl_id));
     HDassert(H5I_DATATYPE == H5I_get_type(type_id));
@@ -666,7 +666,7 @@ H5Z_can_apply(hid_t dcpl_id, hid_t type_id)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_can_apply, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Make "can apply" callbacks for filters in pipeline */
     if(H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_CAN_APPLY) < 0)
@@ -701,7 +701,7 @@ H5Z_set_local(hid_t dcpl_id, hid_t type_id)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_set_local, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Make "set local" callbacks for filters in pipeline */
     if(H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_SET_LOCAL) < 0)
@@ -731,7 +731,7 @@ H5Z_can_apply_direct(const H5O_pline_t *pline)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_can_apply_direct, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline->nused > 0);
 
@@ -768,7 +768,7 @@ H5Z_set_local_direct(const H5O_pline_t *pline)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_set_local_direct, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline->nused > 0);
 
@@ -802,7 +802,7 @@ H5Z_modify(const H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
     size_t	idx;                    /* Index of filter in pipeline */
     herr_t      ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_modify, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline);
     HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
@@ -872,7 +872,7 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
     size_t	idx;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_append, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(pline);
     HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
@@ -977,7 +977,7 @@ H5Z_find_idx(H5Z_filter_t id)
     size_t i;                   /* Local index variable */
     int ret_value=FAIL;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_find_idx)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     for (i=0; i<H5Z_table_used_g; i++)
 	if (H5Z_table_g[i].id == id)
@@ -1012,7 +1012,7 @@ H5Z_find(H5Z_filter_t id)
     int	idx;                            /* Filter index in global table */
     H5Z_class2_t *ret_value=NULL;        /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_find, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* Get the index in the global table */
     if((idx=H5Z_find_idx(id))<0)
@@ -1071,7 +1071,7 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
     unsigned	tmp_flags;
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_pipeline, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     assert(0==(flags & ~((unsigned)H5Z_FLAG_INVMASK)));
     assert(filter_mask);
@@ -1197,7 +1197,7 @@ H5Z_filter_info(const H5O_pline_t *pline, H5Z_filter_t filter)
     size_t	idx;                    /* Index of filter in pipeline */
     H5Z_filter_info_t *ret_value;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_filter_info, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     assert(pline);
     assert(filter>=0 && filter<=H5Z_FILTER_MAX);
@@ -1240,7 +1240,7 @@ H5Z_all_filters_avail(const H5O_pline_t *pline)
     size_t i,j;                 /* Local index variable */
     htri_t ret_value=TRUE;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_all_filters_avail, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     assert(pline);
@@ -1284,7 +1284,7 @@ H5Z_delete(H5O_pline_t *pline, H5Z_filter_t filter)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_delete, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(pline);
@@ -1368,7 +1368,7 @@ H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags)
     H5Z_class2_t *fclass;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_API(H5Zget_filter_info, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "Zf*Iu", filter, filter_config_flags);
 
     /* Look up the filter class info */