[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/H5C.c b/src/H5C.c
index c6d4cf1..8062d7f 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -219,7 +219,7 @@ H5C_epoch_marker_load(H5F_t UNUSED * f,
 {
     void * ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_epoch_marker_load, NULL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "called unreachable fcn.")
 
@@ -238,7 +238,7 @@ H5C_epoch_marker_flush(H5F_t UNUSED *f,
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_epoch_marker_flush, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -253,7 +253,7 @@ H5C_epoch_marker_dest(H5F_t UNUSED * f,
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_epoch_marker_dest, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -269,7 +269,7 @@ H5C_epoch_marker_clear(H5F_t UNUSED * f,
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_epoch_marker_clear, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -284,7 +284,7 @@ H5C_epoch_marker_notify(H5C_notify_action_t UNUSED action,
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C_epoch_marker_notify)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -299,7 +299,7 @@ H5C_epoch_marker_size(const H5F_t UNUSED * f,
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_epoch_marker_size, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -435,7 +435,7 @@ H5C_apply_candidate_list(H5F_t * f,
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
     herr_t              ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_apply_candidate_list, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -751,7 +751,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
     size_t              space_needed;
     herr_t              ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_construct_candidate_list__clean_cache, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -862,7 +862,7 @@ H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr)
     size_t              space_needed = 0;
     herr_t              ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_construct_candidate_list__min_clean, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -965,7 +965,7 @@ H5C_create(size_t		      max_cache_size,
     H5C_t * cache_ptr = NULL;
     H5C_t * ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_create, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     HDassert( max_cache_size >= H5C__MIN_MAX_CACHE_SIZE );
     HDassert( max_cache_size <= H5C__MAX_MAX_CACHE_SIZE );
@@ -1390,7 +1390,7 @@ H5C_dest(H5F_t * f,
     H5C_t * cache_ptr = f->shared->cache;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_dest, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(cache_ptr);
@@ -1444,7 +1444,7 @@ H5C_expunge_entry(H5F_t *             f,
     H5C_cache_entry_t *	entry_ptr = NULL;
     herr_t		ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_expunge_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( f->shared );
@@ -1576,7 +1576,7 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign
     size_t              initial_slist_size;
 #endif /* H5C_DO_SANITY_CHECKS */
 
-    FUNC_ENTER_NOAPI(H5C_flush_cache, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -1934,7 +1934,7 @@ H5C_flush_to_min_clean(H5F_t * f,
 #endif /* JRM */
     herr_t		ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C_flush_to_min_clean, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( f->shared );
@@ -2105,7 +2105,7 @@ H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_get_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -2154,7 +2154,7 @@ H5C_get_cache_size(H5C_t * cache_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_get_cache_size, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -2211,7 +2211,7 @@ H5C_get_cache_hit_rate(H5C_t * cache_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_get_cache_hit_rate, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -2278,7 +2278,7 @@ H5C_get_entry_status(const H5F_t *f,
     H5C_cache_entry_t *	entry_ptr = NULL;
     herr_t		ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_get_entry_status, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( f->shared );
@@ -2358,7 +2358,7 @@ H5C_get_evictions_enabled(const H5C_t *cache_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_get_evictions_enabled, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -2399,7 +2399,7 @@ done:
 herr_t
 H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr)
+    FUNC_ENTER_NOAPI_NOERR
 
     HDassert(cache_ptr);
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -2431,7 +2431,7 @@ herr_t
 H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
     FILE **trace_file_ptr_ptr)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr_from_entry)
+    FUNC_ENTER_NOAPI_NOERR
 
     /* Sanity checks */
     HDassert(entry_ptr);
@@ -2490,7 +2490,7 @@ H5C_insert_entry(H5F_t *             f,
     H5C_cache_entry_t *	entry_ptr;
     H5C_cache_entry_t *	test_entry_ptr;
 
-    FUNC_ENTER_NOAPI(H5C_insert_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( f->shared );
@@ -2796,7 +2796,7 @@ H5C_mark_entries_as_clean(H5F_t *  f,
     H5C_cache_entry_t *	entry_ptr = NULL;
     herr_t		ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_mark_entries_as_clean, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( f->shared );
@@ -3066,7 +3066,7 @@ H5C_mark_entry_dirty(void *thing)
     H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_mark_entry_dirty, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
     HDassert(entry_ptr);
@@ -3145,7 +3145,7 @@ H5C_move_entry(H5C_t *	     cache_ptr,
 #endif /* H5C_DO_SANITY_CHECKS */
     herr_t			ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_move_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3309,7 +3309,7 @@ H5C_resize_entry(void *thing, size_t new_size)
     H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_resize_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
     HDassert(entry_ptr);
@@ -3412,7 +3412,7 @@ H5C_pin_protected_entry(void *thing)
     H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing; /* Pointer to entry to pin */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_pin_protected_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
     HDassert(entry_ptr);
@@ -3513,7 +3513,7 @@ H5C_protect(H5F_t *		f,
     H5C_cache_entry_t *	entry_ptr;
     void *		ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_protect, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* check args */
     HDassert( f );
@@ -3881,7 +3881,7 @@ H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr)
 {
     herr_t	ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_reset_cache_hit_rate_stats, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -3926,7 +3926,7 @@ H5C_set_cache_auto_resize_config(H5C_t *cache_ptr,
     size_t      new_min_clean_size;
     herr_t	ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_set_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -4200,7 +4200,7 @@ H5C_set_evictions_enabled(H5C_t *cache_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_set_evictions_enabled, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
@@ -4254,7 +4254,7 @@ H5C_set_prefix(H5C_t * cache_ptr, char * prefix)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_set_prefix, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( ( cache_ptr == NULL ) ||
          ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
@@ -4297,7 +4297,7 @@ H5C_set_trace_file_ptr(H5C_t * cache_ptr,
 {
     herr_t		ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_set_trace_file_ptr, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
@@ -4384,7 +4384,7 @@ H5C_stats(H5C_t * cache_ptr,
     double      average_entries_scanned_per_calls_to_msic = 0.0;
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-    FUNC_ENTER_NOAPI(H5C_stats, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
@@ -4911,7 +4911,7 @@ H5C_dump_cache(H5C_t * cache_ptr,
     H5SL_t *            slist_ptr = NULL;
     H5SL_node_t *       node_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C_dump_cache, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cache_ptr != NULL);
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -5045,7 +5045,7 @@ H5C_unpin_entry(void *_entry_ptr)
     H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)_entry_ptr; /* Pointer to entry to unpin */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_unpin_entry, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(entry_ptr);
@@ -5136,7 +5136,7 @@ H5C_unprotect(H5F_t *		  f,
     H5C_cache_entry_t *	test_entry_ptr;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_unprotect, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     deleted          = ( (flags & H5C__DELETED_FLAG) != 0 );
     dirtied          = ( (flags & H5C__DIRTIED_FLAG) != 0 );
@@ -5465,7 +5465,7 @@ H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
 {
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C_validate_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if ( config_ptr == NULL ) {
 
@@ -5743,7 +5743,7 @@ H5C__auto_adjust_cache_size(H5F_t * f,
     enum H5C_resize_status	status = in_spec; /* will change if needed */
     herr_t			ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__auto_adjust_cache_size)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( f );
     HDassert( cache_ptr );
@@ -6093,7 +6093,7 @@ H5C__autoadjust__ageout(H5F_t * f,
     size_t	test_size;
     herr_t	ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( f );
     HDassert( cache_ptr );
@@ -6206,7 +6206,7 @@ H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr)
     herr_t                      ret_value = SUCCEED;      /* Return value */
     int i;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__cycle_epoch_marker)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6344,7 +6344,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
     H5C_cache_entry_t * prev_ptr;
     herr_t              ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__evict_aged_out_entries)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( f );
     HDassert( cache_ptr );
@@ -6551,7 +6551,7 @@ H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr)
     herr_t                      ret_value = SUCCEED;      /* Return value */
     int i;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__insert_new_marker)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6629,7 +6629,7 @@ H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr)
     int i;
     int ring_buf_index;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_all_markers)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6710,7 +6710,7 @@ H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr)
     int		i;
     int		ring_buf_index;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_excess_markers)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6806,7 +6806,7 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
     double                     hit_rate;
     herr_t                     ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C__flash_increase_cache_size)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -7003,7 +7003,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
 #endif /* H5C_DO_SANITY_CHECKS */
     herr_t		ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C_flush_invalidate_cache, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert( f );
     HDassert( cache_ptr );
@@ -7530,7 +7530,7 @@ H5C_flush_single_entry(H5F_t *	   	   f,
     H5C_cache_entry_t * entry_ptr = NULL;
     herr_t		ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C_flush_single_entry)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( f );
     HDassert( cache_ptr );
@@ -7942,7 +7942,7 @@ H5C_load_entry(H5F_t *             f,
     H5C_cache_entry_t *	entry;          /* Alias for thing loaded, as cache entry */
     void *		ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C_load_entry)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(f);
     HDassert(f->shared);
@@ -8104,7 +8104,7 @@ H5C_make_space_in_cache(H5F_t *	f,
     H5C_cache_entry_t *	next_ptr;
     herr_t		ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C_make_space_in_cache)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( f );
     HDassert( cache_ptr );
@@ -8401,7 +8401,7 @@ H5C_validate_lru_list(H5C_t * cache_ptr)
     size_t              size = 0;
     H5C_cache_entry_t *	entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C_validate_lru_list)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -8522,7 +8522,7 @@ H5C_verify_not_in_index(H5C_t * cache_ptr,
     int32_t             depth;
     H5C_cache_entry_t *	scan_ptr = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C_verify_not_in_index)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );