Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'f03758613a6ec83e5ddd664590d162ccc888f13e':
  Snapshot version 1.11 release 2.
  Normalization with vol_integration (test code and H5Xtest.c)

1 files changed, 20 insertions, 20 deletions

diff --git a/src/H5Ptest.c b/src/H5Ptest.c
index 475a164..075040d 100644
--- a/src/H5Ptest.c
+++ b/src/H5Ptest.c
@@ -35,11 +35,11 @@
 
 /*--------------------------------------------------------------------------
  NAME
-    H5P_get_class_path_test
+    H5P__get_class_path_test
  PURPOSE
     Routine to query the full path of a generic property list class
  USAGE
-    char *H5P_get_class_name_test(pclass_id)
+    char *H5P__get_class_name_test(pclass_id)
         hid_t pclass_id;         IN: Property class to query
  RETURNS
     Success: Pointer to a malloc'ed string containing the full path of class
@@ -51,17 +51,17 @@
 
  GLOBAL VARIABLES
  COMMENTS, BUGS, ASSUMPTIONS
-    DO NOT USE THIS FUNCTION FOR ANYTHING EXCEPT TESTING H5P_get_class_path()
+    DO NOT USE THIS FUNCTION FOR ANYTHING EXCEPT TESTING H5P__get_class_path()
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
 char *
-H5P_get_class_path_test(hid_t pclass_id)
+H5P__get_class_path_test(hid_t pclass_id)
 {
     H5P_genclass_t	*pclass;        /* Property class to query */
     char *ret_value = NULL;             /* Return value */
 
-    FUNC_ENTER_NOAPI(NULL)
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments. */
     if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
@@ -73,53 +73,53 @@ H5P_get_class_path_test(hid_t pclass_id)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_get_class_path_test() */
+}   /* H5P__get_class_path_test() */
 
 
 /*--------------------------------------------------------------------------
  NAME
-    H5P_open_class_path_test
+    H5P__open_class_path_test
  PURPOSE
     Routine to open a [copy of] a class with its full path name
  USAGE
-    hid_t H5P_open_class_name_test(path)
+    hid_t H5P__open_class_name_test(path)
         const char *path;       IN: Full path name of class to open [copy of]
  RETURNS
     Success: ID of generic property class
-    Failure: NULL
+    Failure: H5I_INVALID_HID
  DESCRIPTION
     This routine opens [a copy] of the class indicated by the full path.
 
  GLOBAL VARIABLES
  COMMENTS, BUGS, ASSUMPTIONS
-    DO NOT USE THIS FUNCTION FOR ANYTHING EXCEPT TESTING H5P_open_class_path()
+    DO NOT USE THIS FUNCTION FOR ANYTHING EXCEPT TESTING H5P__open_class_path()
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
 hid_t
-H5P_open_class_path_test(const char *path)
+H5P__open_class_path_test(const char *path)
 {
     H5P_genclass_t *pclass = NULL;      /* Property class to query */
     hid_t ret_value = H5I_INVALID_HID;  /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments. */
-    if (NULL == path || *path=='\0')
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid class path");
+    if(NULL == path || *path=='\0')
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid class path");
 
     /* Open the property list class */
-    if ((pclass=H5P_open_class_path(path))==NULL)
-        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "unable to find class with full path");
+    if(NULL == (pclass = H5P_open_class_path(path)))
+        HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, H5I_INVALID_HID, "unable to find class with full path");
 
     /* Get an atom for the class */
-    if ((ret_value=H5I_register(H5I_GENPROP_CLS, pclass, TRUE))<0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to atomize property list class");
+    if((ret_value = H5I_register(H5I_GENPROP_CLS, pclass, TRUE)) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to atomize property list class");
 
 done:
-    if(ret_value<0 && pclass)
+    if(H5I_INVALID_HID == ret_value && pclass)
         H5P_close_class(pclass);
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5P_open_class_path_test() */
+}   /* H5P__open_class_path_test() */