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

diff --git a/src/H5I.c b/src/H5I.c
index 79a53f0..13a07f9 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -154,7 +154,7 @@ DESCRIPTION
 static herr_t
 H5I_init_interface(void)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5I_init_interface() */
@@ -183,7 +183,7 @@ H5I_term_interface(void)
     H5I_type_t		type;
     int		n = 0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_term_interface)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(H5_interface_initialize_g) {
         /* How many types are still being used? */
@@ -235,7 +235,7 @@ H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func)
 {
     H5I_type_t ret_value;       /* Return value */
 
-    FUNC_ENTER_API(H5Iregister_type, H5I_BADID)
+    FUNC_ENTER_API(H5I_BADID)
     H5TRACE3("It", "zIux", hash_size, reserved, free_func);
 
     /* Call H5I_register_type with a value of 0 to get a new type */
@@ -277,7 +277,7 @@ H5I_register_type(H5I_type_t type_id, size_t hash_size, unsigned reserved,
     H5I_id_type_t	*type_ptr = NULL;		/*ptr to the atomic type*/
     H5I_type_t ret_value = H5I_BADID;                   /* type ID to return */
 
-    FUNC_ENTER_NOAPI(H5I_register_type, H5I_BADID)
+    FUNC_ENTER_NOAPI(H5I_BADID)
 
     /* Check that type_id is either a library type or zero */
     if(type_id < 0 || type_id >= H5I_NTYPES)
@@ -389,7 +389,7 @@ H5Itype_exists(H5I_type_t type)
 {
     htri_t ret_value = TRUE;                      /* Return value */
 
-    FUNC_ENTER_API(H5Itype_exists, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "It", type);
 
     if(type <= H5I_BADID || type >= H5I_next_type)
@@ -425,7 +425,7 @@ H5Inmembers(H5I_type_t type, hsize_t *num_members)
 {
     int ret_value = SUCCEED;                      /* Return value */
 
-    FUNC_ENTER_API(H5Inmembers, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "It*h", type, num_members);
 
     if(H5I_IS_LIB_TYPE(type))
@@ -475,7 +475,7 @@ H5I_nmembers(H5I_type_t type)
     H5I_id_type_t	*type_ptr = NULL;
     int		ret_value;
 
-    FUNC_ENTER_NOAPI(H5I_nmembers, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(type <= H5I_BADID || type >= H5I_next_type)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -511,7 +511,7 @@ H5Iclear_type(H5I_type_t type, hbool_t force)
 {
     herr_t ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iclear_type, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "Itb", type, force);
 
     if(H5I_IS_LIB_TYPE(type))
@@ -564,7 +564,7 @@ H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref)
     unsigned	i;                      /* Local index variable */
     int		ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_clear_type, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(type <= H5I_BADID || type >= H5I_next_type)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -701,7 +701,7 @@ H5Idestroy_type(H5I_type_t type)
 {
     herr_t ret_value;           /* Return value */
 
-    FUNC_ENTER_API(H5Idestroy_type, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "It", type);
 
     if(H5I_IS_LIB_TYPE(type))
@@ -735,7 +735,7 @@ H5I_destroy_type(H5I_type_t type)
     H5I_id_type_t *type_ptr;	/* ptr to the atomic type */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_destroy_type, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(type <= H5I_BADID || type >= H5I_next_type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -776,7 +776,7 @@ H5Iregister(H5I_type_t type, const void *object)
 {
     hid_t ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iregister, H5I_INVALID_HID)
+    FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE2("i", "It*x", type, object);
 
     if(H5I_IS_LIB_TYPE(type))
@@ -825,7 +825,7 @@ H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
     unsigned		i;		/*counter			*/
     hid_t		ret_value = SUCCEED; /*return value		*/
 
-    FUNC_ENTER_NOAPI(H5I_register, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
     if(type <= H5I_BADID || type >= H5I_next_type)
@@ -950,7 +950,7 @@ H5I_subst(hid_t id, const void *new_object)
     H5I_id_info_t	*id_ptr;	/* Ptr to the atom	*/
     void		*ret_value;	/* Return value		*/
 
-    FUNC_ENTER_NOAPI(H5I_subst, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* General lookup of the ID */
     if(NULL == (id_ptr = H5I_find_id(id)))
@@ -987,7 +987,7 @@ H5I_object(hid_t id)
     H5I_id_info_t	*id_ptr;		/*ptr to the new atom	*/
     void		*ret_value = NULL;	/*return value		*/
 
-    FUNC_ENTER_NOAPI(H5I_object, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* General lookup of the ID */
     if(NULL != (id_ptr = H5I_find_id(id))) {
@@ -1023,7 +1023,7 @@ H5Iobject_verify(hid_t id, H5I_type_t id_type)
 {
     void * ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iobject_verify, NULL)
+    FUNC_ENTER_API(NULL)
 
     if(H5I_IS_LIB_TYPE(id_type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1059,7 +1059,7 @@ H5I_object_verify(hid_t id, H5I_type_t id_type)
     H5I_id_info_t	*id_ptr = NULL;		/*ptr to the new atom	*/
     void		*ret_value = NULL;	/*return value		*/
 
-    FUNC_ENTER_NOAPI(H5I_object_verify, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     HDassert(id_type >= 1 && id_type < H5I_next_type);
 
@@ -1096,7 +1096,7 @@ H5I_get_type(hid_t id)
 {
     H5I_type_t		ret_value = H5I_BADID;
 
-    FUNC_ENTER_NOAPI(H5I_get_type, H5I_BADID)
+    FUNC_ENTER_NOAPI(H5I_BADID)
 
     if(id > 0)
         ret_value = H5I_TYPE(id);
@@ -1128,7 +1128,7 @@ H5Iget_type(hid_t id)
 {
     H5I_type_t		ret_value = H5I_BADID;          /* Return value */
 
-    FUNC_ENTER_API(H5Iget_type, H5I_BADID)
+    FUNC_ENTER_API(H5I_BADID)
     H5TRACE1("It", "i", id);
 
     ret_value = H5I_get_type(id);
@@ -1163,7 +1163,7 @@ H5Iremove_verify(hid_t id, H5I_type_t id_type)
 {
     void * ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iremove_verify, NULL)
+    FUNC_ENTER_API(NULL)
 
     if(H5I_IS_LIB_TYPE(id_type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1197,7 +1197,7 @@ H5I_remove_verify(hid_t id, H5I_type_t id_type)
 {
     void * ret_value = NULL;	/*return value			*/
 
-    FUNC_ENTER_NOAPI(H5I_remove_verify, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* Argument checking will be performed by H5I_remove() */
 
@@ -1236,7 +1236,7 @@ H5I_remove(hid_t id)
     unsigned		hash_loc;	/*atom's hash table location	*/
     void *	      ret_value = NULL;	/*return value			*/
 
-    FUNC_ENTER_NOAPI(H5I_remove, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments */
     type = H5I_TYPE(id);
@@ -1328,7 +1328,7 @@ H5Idec_ref(hid_t id)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Idec_ref, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
@@ -1369,7 +1369,7 @@ H5I_dec_ref(hid_t id)
     H5I_id_info_t	*id_ptr;	/*ptr to the new ID	*/
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_dec_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(id >= 0);
@@ -1440,7 +1440,7 @@ H5I_dec_app_ref(hid_t id)
     H5I_id_info_t	*id_ptr;	/*ptr to the new ID	*/
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_dec_app_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(id >= 0);
@@ -1487,7 +1487,7 @@ H5I_dec_app_ref_always_close(hid_t id)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_dec_app_ref_always_close, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(id >= 0);
@@ -1531,7 +1531,7 @@ H5Iinc_ref(hid_t id)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iinc_ref, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
@@ -1575,7 +1575,7 @@ H5I_inc_ref(hid_t id, hbool_t app_ref)
     H5I_id_info_t	*id_ptr;	/*ptr to the ID		*/
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_inc_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(id >= 0);
@@ -1623,7 +1623,7 @@ H5Iget_ref(hid_t id)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iget_ref, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
@@ -1667,7 +1667,7 @@ H5I_get_ref(hid_t id, hbool_t app_ref)
     H5I_id_info_t	*id_ptr;	/*ptr to the ID		*/
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_get_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(id >= 0);
@@ -1711,7 +1711,7 @@ H5Iinc_type_ref(H5I_type_t type)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iinc_type_ref, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "It", type);
 
     /* Check arguments */
@@ -1750,7 +1750,7 @@ H5I_inc_type_ref(H5I_type_t type)
     H5I_id_type_t	*type_ptr;	/* ptr to the type	*/
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_inc_type_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(type > 0 && type < H5I_next_type);
@@ -1795,7 +1795,7 @@ H5Idec_type_ref(H5I_type_t type)
 {
     herr_t ret_value;           /* Return value */
 
-    FUNC_ENTER_API(H5Idec_type_ref, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "It", type);
 
     if(H5I_IS_LIB_TYPE(type))
@@ -1834,7 +1834,7 @@ H5I_dec_type_ref(H5I_type_t type)
     H5I_id_type_t	*type_ptr;      /* Pointer to the ID type */
     herr_t		ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_dec_type_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     if(type <= H5I_BADID || type >= H5I_next_type)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -1882,7 +1882,7 @@ H5Iget_type_ref(H5I_type_t type)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Iget_type_ref, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "It", type);
 
     /* Check arguments */
@@ -1922,7 +1922,7 @@ H5I_get_type_ref(H5I_type_t type)
     H5I_id_type_t	*type_ptr;	/*ptr to the type	*/
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_get_type_ref, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
     HDassert(type >= 0);
@@ -1961,7 +1961,7 @@ H5Iis_valid(hid_t id)
     H5I_id_info_t   *id_ptr;            /* ptr to the ID */
     htri_t          ret_value = TRUE;   /* Return value */
 
-    FUNC_ENTER_API(H5Iis_valid, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", id);
 
     /* Find the ID */
@@ -2006,7 +2006,7 @@ H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key)
 {
     void * ret_value;                      /* Return value */
 
-    FUNC_ENTER_API(H5Isearch, NULL)
+    FUNC_ENTER_API(NULL)
 
     if(H5I_IS_LIB_TYPE(type))
         HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -2051,7 +2051,7 @@ H5I_search(H5I_type_t type, H5I_search_func_t func, void *key, hbool_t app_ref)
     H5I_id_type_t	*type_ptr;	/*ptr to the type	*/
     void		*ret_value = NULL;	/*return value		*/
 
-    FUNC_ENTER_NOAPI(H5I_search, NULL)
+    FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments */
     if(type <= H5I_BADID || type >= H5I_next_type)
@@ -2109,7 +2109,7 @@ H5I_find_id(hid_t id)
     unsigned		hash_loc;		/*bucket pointer	*/
     H5I_id_info_t	*ret_value;		/*return value		*/
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_find_id)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check arguments */
     type = H5I_TYPE(id);
@@ -2179,7 +2179,7 @@ H5Iget_name(hid_t id, char *name/*out*/, size_t size)
     H5G_loc_t     loc;          /* Object location */
     ssize_t       ret_value;    /* Return value */
 
-    FUNC_ENTER_API(H5Iget_name, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "ixz", id, name, size);
 
     /* Get object location */
@@ -2215,7 +2215,7 @@ H5Iget_file_id(hid_t obj_id)
 {
     hid_t ret_value;            /* Return value */
 
-    FUNC_ENTER_API(H5Iget_file_id, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("i", "i", obj_id);
 
     if((ret_value = H5I_get_file_id(obj_id, TRUE)) < 0)
@@ -2246,7 +2246,7 @@ H5I_get_file_id(hid_t obj_id, hbool_t app_ref)
     H5I_type_t type;            /* ID type */
     hid_t ret_value;            /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5I_get_file_id)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Get object type */
     type = H5I_TYPE(obj_id);
@@ -2301,7 +2301,7 @@ H5I_debug(H5I_type_t type)
     unsigned int iu;
     herr_t ret_value;  /* Return value */
 
-    FUNC_ENTER_NOAPI(H5I_debug, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     fprintf(stderr, "Dumping ID type %d\n", (int)type);
     type_ptr = H5I_id_type_list_g[type];