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

diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 7dea0b2..c3371c9 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -217,7 +217,7 @@ H5P_facc_reg_prop(H5P_genclass_t *pclass)
     unsigned efc_size = H5F_ACS_EFC_SIZE_DEF;                   /* Default external file cache size */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5P_facc_reg_prop)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Register the initial metadata cache resize configuration */
     if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_CONFIG_SIZE, &mdc_initCacheCfg, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -329,7 +329,7 @@ H5P_facc_create(hid_t fapl_id, void UNUSED *copy_data)
     H5P_genplist_t *plist;              /* Property list */
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5P_facc_create)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check argument */
     if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
@@ -379,7 +379,7 @@ H5P_facc_copy(hid_t dst_fapl_id, hid_t src_fapl_id, void UNUSED *copy_data)
     H5P_genplist_t *src_plist;              /* Source property list */
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5P_facc_copy)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Get driver ID from source property list */
     if(NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_fapl_id)))
@@ -430,7 +430,7 @@ H5P_facc_close(hid_t fapl_id, void UNUSED *close_data)
     H5P_genplist_t *plist;              /* Property list */
     herr_t     ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5P_facc_close, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check argument */
     if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
@@ -491,9 +491,9 @@ herr_t
 H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_alignment, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ihh", fapl_id, threshold, alignment);
 
     /* Check args */
@@ -511,7 +511,7 @@ H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -541,9 +541,9 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
 		  hsize_t *alignment/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API(H5Pget_alignment, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, threshold, alignment);
 
     /* Get the plist structure */
@@ -559,7 +559,7 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get alignment");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -595,9 +595,9 @@ H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_drive
 {
     hid_t driver_id;            /* VFL driver ID */
     void *driver_info;          /* VFL driver info */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5P_set_driver, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(NULL == H5I_object_verify(new_driver_id, H5I_VFL))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver ID")
@@ -672,7 +672,7 @@ H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_API(H5Pset_driver, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ii*x", plist_id, new_driver_id, new_driver_info);
 
     /* Check arguments */
@@ -728,7 +728,7 @@ H5P_get_driver(H5P_genplist_t *plist)
 {
     hid_t	ret_value=FAIL;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5P_get_driver, FAIL);
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the current driver ID */
     if(TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
@@ -745,7 +745,7 @@ H5P_get_driver(H5P_genplist_t *plist)
         ret_value = H5_DEFAULT_VFD;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 
@@ -783,7 +783,7 @@ H5Pget_driver(hid_t plist_id)
     H5P_genplist_t *plist;      /* Property list pointer */
     hid_t	ret_value;      /* Return value */
 
-    FUNC_ENTER_API(H5Pget_driver, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", plist_id);
 
     if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -827,7 +827,7 @@ H5P_get_driver_info(H5P_genplist_t *plist)
 {
     void	*ret_value=NULL;
 
-    FUNC_ENTER_NOAPI(H5P_get_driver_info, NULL);
+    FUNC_ENTER_NOAPI(NULL)
 
     /* Get the current driver info */
     if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
@@ -841,7 +841,7 @@ H5P_get_driver_info(H5P_genplist_t *plist)
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_driver_info() */
 
 
@@ -877,7 +877,7 @@ H5Pget_driver_info(hid_t plist_id)
     H5P_genplist_t *plist;      /* Property list pointer */
     void	*ret_value;     /* Return value */
 
-    FUNC_ENTER_API(H5Pget_driver_info, NULL);
+    FUNC_ENTER_API(NULL)
 
     if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
@@ -912,9 +912,9 @@ herr_t
 H5Pset_family_offset(hid_t fapl_id, hsize_t offset)
 {
     H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value=SUCCEED;      /* return value */
+    herr_t              ret_value = SUCCEED;      /* return value */
 
-    FUNC_ENTER_API(H5Pset_family_offset, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", fapl_id, offset);
 
     /* Get the plist structure */
@@ -927,7 +927,7 @@ H5Pset_family_offset(hid_t fapl_id, hsize_t offset)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set family offset");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -951,9 +951,9 @@ done:
 static herr_t
 H5P_set_family_offset(H5P_genplist_t *plist, hsize_t offset)
 {
-    herr_t      ret_value=SUCCEED;
+    herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5P_set_family_offset, FAIL);
+    FUNC_ENTER_NOAPI(FAIL)
 
     if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
          if(H5P_set(plist, H5F_ACS_FAMILY_OFFSET_NAME, &offset) < 0)
@@ -963,7 +963,7 @@ H5P_set_family_offset(H5P_genplist_t *plist, hsize_t offset)
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 
@@ -989,9 +989,9 @@ herr_t
 H5Pget_family_offset(hid_t fapl_id, hsize_t *offset)
 {
     H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value=SUCCEED;      /* return value */
+    herr_t              ret_value = SUCCEED;      /* return value */
 
-    FUNC_ENTER_API(H5Pget_family_offset, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", fapl_id, offset);
 
     /* Get the plist structure */
@@ -1004,7 +1004,7 @@ H5Pget_family_offset(hid_t fapl_id, hsize_t *offset)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get family offset");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1028,9 +1028,9 @@ done:
 static herr_t
 H5P_get_family_offset(H5P_genplist_t *plist, hsize_t *offset)
 {
-    herr_t      ret_value=SUCCEED;
+    herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5P_get_family_offset, FAIL);
+    FUNC_ENTER_NOAPI(FAIL)
 
     if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
         if(H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, offset) < 0)
@@ -1040,7 +1040,7 @@ H5P_get_family_offset(H5P_genplist_t *plist, hsize_t *offset)
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 
@@ -1066,9 +1066,9 @@ herr_t
 H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
 {
     H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value=SUCCEED;      /* return value */
+    herr_t              ret_value = SUCCEED;      /* return value */
 
-    FUNC_ENTER_API(H5Pset_multi_type, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iMt", fapl_id, type);
 
     /* Get the plist structure */
@@ -1081,7 +1081,7 @@ H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data type for multi driver");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1105,9 +1105,9 @@ done:
 static herr_t
 H5P_set_multi_type(H5P_genplist_t *plist, H5FD_mem_t type)
 {
-    herr_t      ret_value=SUCCEED;
+    herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5P_set_multi_type, FAIL);
+    FUNC_ENTER_NOAPI(FAIL)
 
     if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
          if(H5P_set(plist, H5F_ACS_MULTI_TYPE_NAME, &type) < 0)
@@ -1117,7 +1117,7 @@ H5P_set_multi_type(H5P_genplist_t *plist, H5FD_mem_t type)
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 
@@ -1143,9 +1143,9 @@ herr_t
 H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
 {
     H5P_genplist_t      *plist;                 /* Property list pointer */
-    herr_t              ret_value=SUCCEED;      /* return value */
+    herr_t              ret_value = SUCCEED;      /* return value */
 
-    FUNC_ENTER_API(H5Pget_multi_type, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Mt", fapl_id, type);
 
     /* Get the plist structure */
@@ -1158,7 +1158,7 @@ H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get data type for multi driver");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1182,9 +1182,9 @@ done:
 static herr_t
 H5P_get_multi_type(H5P_genplist_t *plist, H5FD_mem_t *type)
 {
-    herr_t      ret_value=SUCCEED;
+    herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5P_get_multi_type, FAIL);
+    FUNC_ENTER_NOAPI(FAIL)
 
     if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
          if(H5P_get(plist, H5F_ACS_MULTI_TYPE_NAME, type) < 0)
@@ -1194,7 +1194,7 @@ H5P_get_multi_type(H5P_genplist_t *plist, H5FD_mem_t *type)
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 
@@ -1236,9 +1236,9 @@ H5Pset_cache(hid_t plist_id, int UNUSED mdc_nelmts,
 	     size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_cache, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iIszzd", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes,
              rdcc_w0);
 
@@ -1259,7 +1259,7 @@ H5Pset_cache(hid_t plist_id, int UNUSED mdc_nelmts,
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1296,9 +1296,9 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
 	     size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_cache, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "i*Is*z*z*d", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes,
              rdcc_w0);
 
@@ -1323,7 +1323,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1346,7 +1346,7 @@ H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_mdc_config, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", plist_id, config_ptr);
 
     /* Get the plist structure */
@@ -1367,7 +1367,7 @@ H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set metadata cache initial config")
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 } /* H5Pset_mdc_config() */
 
 
@@ -1394,7 +1394,7 @@ H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_mdc_config, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", plist_id, config_ptr);
 
     /* Get the plist structure */
@@ -1457,9 +1457,9 @@ herr_t
 H5Pset_gc_references(hid_t plist_id, unsigned gc_ref)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_gc_references, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, gc_ref);
 
     /* Get the plist structure */
@@ -1471,7 +1471,7 @@ H5Pset_gc_references(hid_t plist_id, unsigned gc_ref)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set garbage collect reference");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1499,9 +1499,9 @@ herr_t
 H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_gc_references, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, gc_ref);
 
     /* Get the plist structure */
@@ -1514,7 +1514,7 @@ H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get garbage collect reference");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1538,7 +1538,7 @@ H5Pset_fclose_degree(hid_t plist_id, H5F_close_degree_t degree)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_fclose_degree, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iFd", plist_id, degree);
 
     /* Get the plist structure */
@@ -1574,7 +1574,7 @@ H5Pget_fclose_degree(hid_t plist_id, H5F_close_degree_t *degree)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_fclose_degree, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Fd", plist_id, degree);
 
     /* Get the plist structure */
@@ -1622,9 +1622,9 @@ herr_t
 H5Pset_meta_block_size(hid_t plist_id, hsize_t size)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_meta_block_size, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", plist_id, size);
 
     /* Get the plist structure */
@@ -1636,7 +1636,7 @@ H5Pset_meta_block_size(hid_t plist_id, hsize_t size)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set meta data block size");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1664,9 +1664,9 @@ herr_t
 H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_meta_block_size, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size);
 
     /* Get the plist structure */
@@ -1680,7 +1680,7 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/)
     } /* end if */
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -1717,9 +1717,9 @@ herr_t
 H5Pset_sieve_buf_size(hid_t plist_id, size_t size)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", plist_id, size);
 
     /* Get the plist structure */
@@ -1731,7 +1731,7 @@ H5Pset_sieve_buf_size(hid_t plist_id, size_t size)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_sieve_buf_size() */
 
 
@@ -1759,9 +1759,9 @@ herr_t
 H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size);
 
     /* Get the plist structure */
@@ -1774,7 +1774,7 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get sieve buffer size");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_sieve_buf_size() */
 
 
@@ -1806,9 +1806,9 @@ herr_t
 H5Pset_small_data_block_size(hid_t plist_id, hsize_t size)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_small_data_block_size, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ih", plist_id, size);
 
     /* Get the plist structure */
@@ -1820,7 +1820,7 @@ H5Pset_small_data_block_size(hid_t plist_id, hsize_t size)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' block size");
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_small_data_block_size() */
 
 
@@ -1843,9 +1843,9 @@ herr_t
 H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_small_data_block_size, FAIL);
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", plist_id, size);
 
     /* Get the plist structure */
@@ -1859,7 +1859,7 @@ H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/)
     } /* end if */
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_small_data_block_size() */
 
 
@@ -1957,7 +1957,7 @@ H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
     hbool_t latest;             /* Whether to use the latest version or not */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_libver_bounds, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iFvFv", plist_id, low, high);
 
     /* Check args */
@@ -2002,7 +2002,7 @@ H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/,
     hbool_t latest;             /* Whether to use the latest version or not */
     herr_t ret_value = SUCCEED; /* return value */
 
-    FUNC_ENTER_API(H5Pget_libver_bounds, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", plist_id, low, high);
 
     /* Get the plist structure */
@@ -2047,7 +2047,7 @@ H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_elink_file_cache_size, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, efc_size);
 
     /* Get the plist structure */
@@ -2085,7 +2085,7 @@ H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size)
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pget_elink_file_cache_size, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", plist_id, efc_size);
 
     /* Get the plist structure */