[svn-r21925] Description:

    Bring r21919-21924 from trunk to 1.8 branch: cleanup FUNC_ENTER macros,
etc.

    Also removed Subversion mergeinfo tags from a few directories and files.
These are artifacts from non-root merges using pre-1.6 Subversion clients. (This
should fix the problem of unchanged directories looking "changed" during
checkins.)

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug & production
    (daily tested on trunk)

1 files changed, 52 insertions, 52 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index a2e6604..8dce384 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -232,7 +232,7 @@ H5AC_init(void)
 {
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_init, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
 
 done:
@@ -263,7 +263,7 @@ H5AC_init_interface(void)
     H5FD_mpio_xfer_t xfer_mode;     /* I/O transfer mode property value */
     herr_t ret_value=SUCCEED;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(H5P_CLS_DATASET_XFER_g!=(-1));
@@ -342,7 +342,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 
 #else /* H5_HAVE_PARALLEL */
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     assert(H5P_LST_DATASET_XFER_g!=(-1));
@@ -376,7 +376,7 @@ H5AC_term_interface(void)
 {
     int	n = 0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface)
+    FUNC_ENTER_NOAPI_NOINIT
 
     if (H5_interface_initialize_g) {
 #ifdef H5_HAVE_PARALLEL
@@ -465,7 +465,7 @@ H5AC_create(const H5F_t *f,
 #endif /* H5_HAVE_PARALLEL */
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_create, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(NULL == f->shared->cache);
@@ -651,7 +651,7 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id)
 #endif /* H5_HAVE_PARALLEL */
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_dest, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(f);
@@ -730,7 +730,7 @@ H5AC_expunge_entry(H5F_t *f,
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t  ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_expunge_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared);
@@ -815,7 +815,7 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id)
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t	  ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_flush, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared);
@@ -887,7 +887,7 @@ H5AC_get_entry_status(const H5F_t *f,
     unsigned	status = 0;
     herr_t      ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_get_entry_status, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if((f == NULL) || (!H5F_addr_defined(addr)) || (status_ptr == NULL))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
@@ -938,7 +938,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_insert_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared);
@@ -1037,7 +1037,7 @@ H5AC_mark_entry_dirty(void *thing)
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_mark_entry_dirty, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(thing);
@@ -1108,7 +1108,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
 #endif /* H5_HAVE_PARALLEL */
     herr_t ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_move_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared->cache);
@@ -1186,7 +1186,7 @@ H5AC_pin_protected_entry(void *thing)
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(thing);
@@ -1255,7 +1255,7 @@ H5AC_protect(H5F_t *f,
 #endif /* H5AC__TRACE_FILE_ENABLED */
     void *		ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_protect, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* check args */
     HDassert(f);
@@ -1370,7 +1370,7 @@ H5AC_resize_entry(void *thing, size_t new_size)
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_resize_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(thing);
@@ -1437,7 +1437,7 @@ H5AC_unpin_entry(void *thing)
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(thing);
@@ -1519,7 +1519,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared);
@@ -1625,7 +1625,7 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
 {
     H5AC_aux_t * aux_ptr;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_sync_point_done_callback)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC));
 
@@ -1662,7 +1662,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
 {
     H5AC_aux_t * aux_ptr;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_write_done_callback)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC));
 
@@ -1695,7 +1695,7 @@ H5AC_stats(const H5F_t *f)
 {
     herr_t		ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_stats, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared);
@@ -1727,7 +1727,7 @@ H5AC_dump_cache(const H5F_t *f)
 {
     herr_t              ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_dump_cache, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f);
     HDassert(f->shared);
@@ -1764,7 +1764,7 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
     hbool_t evictions_enabled;
     H5C_auto_size_ctl_t internal_config;
 
-    FUNC_ENTER_NOAPI(H5AC_get_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL )
          ||
@@ -1886,7 +1886,7 @@ H5AC_get_cache_size(H5AC_t * cache_ptr,
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_get_cache_size, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     result = H5C_get_cache_size((H5C_t *)cache_ptr,
 				max_size_ptr,
@@ -1924,7 +1924,7 @@ H5AC_get_cache_hit_rate(H5AC_t * cache_ptr, double * hit_rate_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_get_cache_hit_rate, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_hit_rate() failed.")
@@ -1952,7 +1952,7 @@ H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr)
     herr_t result;
     herr_t      ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_reset_cache_hit_rate_stats, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     result = H5C_reset_cache_hit_rate_stats((H5C_t *)cache_ptr);
 
@@ -1993,7 +1993,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
     FILE *              trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC_set_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr );
 
@@ -2170,7 +2170,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
     H5C_auto_size_ctl_t internal_config;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(config_ptr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
@@ -2264,7 +2264,7 @@ H5AC_close_trace_file(H5AC_t * cache_ptr)
     herr_t   ret_value = SUCCEED;    /* Return value */
     FILE *   trace_file_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC_close_trace_file, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( cache_ptr == NULL ) {
 
@@ -2326,7 +2326,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
     H5AC_aux_t * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
-    FUNC_ENTER_NOAPI(H5AC_open_trace_file, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cache_ptr);
 
@@ -2439,7 +2439,7 @@ H5AC_add_candidate(H5AC_t * cache_ptr,
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_add_candidate, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2521,7 +2521,7 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
     int			 num_entries = 0;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_broadcast_candidate_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2632,7 +2632,7 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
     int                  mpi_result;
     int			 num_entries = 0;
 
-    FUNC_ENTER_NOAPI(H5AC_broadcast_clean_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2823,7 +2823,7 @@ H5AC_check_if_write_permitted(const H5F_t UNUSED * f,
 #endif /* H5_HAVE_PARALLEL */
 
 
-    FUNC_ENTER_NOAPI(H5AC_check_if_write_permitted, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5_HAVE_PARALLEL
     HDassert( f != NULL );
@@ -2885,7 +2885,7 @@ H5AC_construct_candidate_list(H5AC_t * cache_ptr,
 {
     herr_t ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_construct_candidate_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2976,7 +2976,7 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
     int                  i = 0;
     int			 num_entries = 0;
 
-    FUNC_ENTER_NOAPI(H5AC_copy_candidate_list_to_buffer, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3098,7 +3098,7 @@ H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr,
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_ext_config_2_int_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( ext_conf_ptr == NULL ) ||
          ( ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) ||
@@ -3177,7 +3177,7 @@ H5AC_log_deleted_entry(H5AC_t * cache_ptr,
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_log_deleted_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3269,7 +3269,7 @@ H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
     H5AC_aux_t         * aux_ptr;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_log_dirtied_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( entry_ptr );
     HDassert( entry_ptr->addr == addr );
@@ -3392,7 +3392,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr,
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
 
 
-    FUNC_ENTER_NOAPI(H5AC_log_flushed_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3519,7 +3519,7 @@ H5AC_log_inserted_entry(H5F_t * f,
     H5AC_aux_t         * aux_ptr;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_log_inserted_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cache_ptr != NULL);
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -3631,7 +3631,7 @@ H5AC_log_moved_entry(const H5F_t *f,
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_log_moved_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( f->shared );
@@ -3881,7 +3881,7 @@ H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
     H5AC_aux_t         * aux_ptr;
     herr_t               ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_propagate_and_apply_candidate_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -4045,7 +4045,7 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
     H5AC_aux_t * aux_ptr;
     herr_t	 ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_propagate_flushed_and_still_clean_entries_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cache_ptr != NULL);
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -4105,7 +4105,7 @@ H5AC_receive_and_apply_clean_list(H5F_t  * f,
     int			 num_entries = 0;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_receive_and_apply_clean_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared->cache == cache_ptr );
@@ -4216,7 +4216,7 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr,
     int			 num_entries;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_receive_candidate_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -4362,7 +4362,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f,
     H5AC_aux_t * aux_ptr;
     herr_t	 ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared->cache == cache_ptr );
@@ -4513,7 +4513,7 @@ H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
     H5AC_aux_t * aux_ptr;
     herr_t	 ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush_to_min_clean, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared->cache == cache_ptr );
@@ -4596,7 +4596,7 @@ H5AC_rsp__p0_only__flush(H5F_t *f,
     H5AC_aux_t * aux_ptr;
     herr_t	 ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared->cache == cache_ptr );
@@ -4698,7 +4698,7 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
     H5AC_aux_t * aux_ptr;
     herr_t	 ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush_to_min_clean, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared->cache == cache_ptr );
@@ -4810,7 +4810,7 @@ H5AC_run_sync_point(H5F_t *f,
     H5AC_aux_t * aux_ptr;
     herr_t	 ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_run_sync_point, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f != NULL );
 
@@ -4947,7 +4947,7 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
     H5AC_aux_t         * aux_ptr;
     herr_t               ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC_tidy_cache_0_lists, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -5040,7 +5040,7 @@ H5AC_flush_entries(H5F_t *f)
 {
     herr_t        ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5AC_flush_entries)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(f);
     HDassert(f->shared->cache);