[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, 25 deletions

diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index e0f87ac..5a707b5 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -317,19 +317,16 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
 static void
 H5Z_unget_token(H5Z_token *current)
 {
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
+
     /* check args */
     assert(current);
 
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_unget_token)
-
     current->tok_type = current->tok_last_type;
     current->tok_begin = current->tok_last_begin;
     current->tok_end = current->tok_last_end;
 
     FUNC_LEAVE_NOAPI_VOID
-
-
 }
 
 
@@ -356,7 +353,7 @@ H5Z_get_token(H5Z_token *current)
 {
     H5Z_token *ret_value = current;
 
-    FUNC_ENTER_NOAPI(H5Z_get_token, NULL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     assert(current);
@@ -485,7 +482,7 @@ done:
 void
 H5Z_xform_destroy_parse_tree(H5Z_node *tree)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_xform_destroy_parse_tree)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if (tree)
     {
@@ -518,7 +515,7 @@ H5Z_xform_parse(const char *expression, H5Z_datval_ptrs* dat_val_pointers)
     H5Z_token tok;
     void* ret_value;
 
-    FUNC_ENTER_NOAPI(H5Z_xform_parse, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     if(!expression)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "No expression provided?")
@@ -557,7 +554,7 @@ H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
     H5Z_node *expr;
     H5Z_node *ret_value;        /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5Z_parse_expression)
+    FUNC_ENTER_NOAPI_NOINIT
 
     expr = H5Z_parse_term(current, dat_val_pointers);
 
@@ -651,7 +648,8 @@ H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
     H5Z_node *term = NULL;
     H5Z_node *ret_value;
 
-    FUNC_ENTER_NOAPI(H5Z_parse_term, NULL);
+    FUNC_ENTER_NOAPI_NOINIT
+
     term = H5Z_parse_factor(current, dat_val_pointers);
 
     for (;;) {
@@ -741,7 +739,7 @@ H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
     H5Z_node 	*new_node;
     H5Z_node    *ret_value;
 
-    FUNC_ENTER_NOAPI(H5Z_parse_factor, NULL);
+    FUNC_ENTER_NOAPI_NOINIT
 
     current = H5Z_get_token(current);
 
@@ -880,7 +878,7 @@ H5Z_new_node(H5Z_token_type type)
 {
     H5Z_node *ret_value;
 
-    FUNC_ENTER_NOAPI(H5Z_new_node, NULL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     if(NULL == (ret_value = (H5Z_node *)H5MM_calloc(sizeof(H5Z_node))))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to allocate space for nodes in the parse tree")
@@ -913,7 +911,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
     size_t i;
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_xform_eval, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(data_xform_prop);
 
@@ -1024,7 +1022,7 @@ H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size,  const hid_t array_
     H5Z_result resl, resr;
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5Z_xform_eval_full, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(tree);
@@ -1111,7 +1109,7 @@ H5Z_xform_find_type(const H5T_t* type)
     H5T_t *tmp;                         /* Temporary datatype */
     hid_t ret_value = SUCCEED;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5Z_xform_find_type)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(type);
 
@@ -1197,7 +1195,7 @@ H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datva
 {
     H5Z_node* ret_value=NULL;
 
-    FUNC_ENTER_NOAPI(H5Z_xform_copy_tree, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     assert(tree);
 
@@ -1273,7 +1271,7 @@ H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datva
 void
 H5Z_xform_reduce_tree(H5Z_node* tree)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_xform_reduce_tree)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(tree) {
         if((tree->type == H5Z_XFORM_PLUS) || (tree->type == H5Z_XFORM_DIVIDE) ||(tree->type == H5Z_XFORM_MULT) ||(tree->type == H5Z_XFORM_MINUS))
@@ -1315,8 +1313,7 @@ H5Z_xform_reduce_tree(H5Z_node* tree)
 static void
 H5Z_do_op(H5Z_node* tree)
 {
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_do_op)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(tree->type == H5Z_XFORM_DIVIDE)
 	H5Z_XFORM_DO_OP3(/)
@@ -1328,7 +1325,6 @@ H5Z_do_op(H5Z_node* tree)
 	H5Z_XFORM_DO_OP3(-)
 
     FUNC_LEAVE_NOAPI_VOID;
-
 }
 
 
@@ -1359,7 +1355,7 @@ H5Z_xform_create(const char *expr)
     unsigned int i;
     unsigned int count = 0;
 
-    FUNC_ENTER_NOAPI(H5Z_xform_create, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     assert(expr);
 
@@ -1445,7 +1441,7 @@ done:
 herr_t
 H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5Z_xform_destroy)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(data_xform_prop) {
 	/* Destroy the parse tree */
@@ -1498,7 +1494,7 @@ H5Z_xform_copy(H5Z_data_xform_t **data_xform_prop)
     H5Z_data_xform_t *new_data_xform_prop=NULL;
     herr_t ret_value=SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5Z_xform_copy, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(*data_xform_prop) {
         /* Allocate new node */
@@ -1575,7 +1571,7 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
 {
     hbool_t ret_value;
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5Z_xform_noop)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     ret_value=(data_xform_prop ? FALSE : TRUE);
 
@@ -1604,7 +1600,7 @@ H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop)
 {
     char* ret_value;
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5Z_xform_extract_xform_str)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* There should be no way that this can be NULL since the function
      * that calls this one checks to make sure it isn't before