Normalization with vol_integration (test code and H5Xtest.c)

1 files changed, 50 insertions, 55 deletions

diff --git a/src/H5Ftest.c b/src/H5Ftest.c
index bdecad2..df9c933 100644
--- a/src/H5Ftest.c
+++ b/src/H5Ftest.c
@@ -26,24 +26,24 @@
 /* Module Setup */
 /****************/
 
-#include "H5Fmodule.h"          /* This source code file is part of the H5F module */
-#define H5F_TESTING		/*suppress warning about H5F testing funcs*/
-#define H5G_FRIEND		/*suppress error about including H5Gpkg  */
-#define H5G_TESTING		/*suppress warning about H5G testing funcs*/
-#define H5SM_FRIEND		/*suppress error about including H5SMpkg  */
-#define H5SM_TESTING		/*suppress warning about H5SM testing funcs*/
+#include "H5Fmodule.h"          /* This source code file is part of the H5F module  */
+#define H5F_TESTING             /* Suppress warning about H5F testing funcs         */
+#define H5G_FRIEND              /* Suppress error about including H5Gpkg.h          */
+#define H5G_TESTING             /* Suppress warning about H5G testing funcs         */
+#define H5SM_FRIEND             /* Suppress error about including H5SMpkg.h         */
+#define H5SM_TESTING            /* Suppress warning about H5SM testing funcs        */
 
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5SMpkg.h"            /* Shared object header messages        */
+#include "H5private.h"          /* Generic Functions                        */
+#include "H5CXprivate.h"        /* API Contexts                             */
+#include "H5Eprivate.h"         /* Error handling                           */
+#include "H5Fpkg.h"             /* File access                              */
+#include "H5Gpkg.h"             /* Groups                                   */
+#include "H5Iprivate.h"         /* IDs                                      */
+#include "H5SMpkg.h"            /* Shared object header messages            */
 
 
 /****************/
@@ -82,31 +82,29 @@
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_get_sohm_mesg_count_test
+ * Function:    H5F__get_sohm_mesg_count_test
  *
  * Purpose:     Retrieve the number of shared messages of a given type in a file
  *
- * Return:	Success:        Non-negative
- *		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Quincey Koziol
- *	        Jan  3, 2007
+ * Programmer:  Quincey Koziol
+ *              Jan  3, 2007
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id,
-    size_t *mesg_count)
+H5F__get_sohm_mesg_count_test(hid_t file_id, unsigned type_id, size_t *mesg_count)
 {
-    H5F_t	*file;                  /* File info */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t      *file;                       /* File info */
+    hbool_t     api_ctx_pushed = FALSE;     /* Whether API context pushed */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Push API context */
     if(H5CX_push() < 0)
@@ -122,19 +120,18 @@ done:
         HDONE_ERROR(H5E_FILE, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_get_sohm_mesg_count_test() */
+} /* end H5F__get_sohm_mesg_count_test() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_check_cached_stab_test
+ * Function:    H5F__check_cached_stab_test
  *
  * Purpose:     Check that a file's superblock contains a cached symbol
  *              table entry, that the entry matches that in the root
  *              group's object header, and check that the addresses are
  *              valid.
  *
- * Return:	Success:        Non-negative
- *		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Neil Fortner
  *	        Mar  31, 2009
@@ -142,17 +139,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_check_cached_stab_test(hid_t file_id)
+H5F__check_cached_stab_test(hid_t file_id)
 {
-    H5F_t	*file;                  /* File info */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t      *file;                       /* File info */
+    hbool_t     api_ctx_pushed = FALSE;     /* Whether API context pushed */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Push API context */
     if(H5CX_push() < 0)
@@ -168,16 +165,15 @@ done:
         HDONE_ERROR(H5E_FILE, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_check_cached_stab_test() */
+} /* end H5F__check_cached_stab_test() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_get_maxaddr_test
+ * Function:    H5F__get_maxaddr_test
  *
  * Purpose:     Retrieve the maximum address for a file
  *
- * Return:	Success:        Non-negative
- *		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *	        Jun 10, 2009
@@ -185,33 +181,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr)
+H5F__get_maxaddr_test(hid_t file_id, haddr_t *maxaddr)
 {
-    H5F_t	*file;                  /* File info */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t      *file;                       /* File info */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Retrieve maxaddr for file */
     *maxaddr = file->shared->maxaddr;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_get_maxaddr_test() */
+} /* end H5F__get_maxaddr_test() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_get_sbe_addr_test
+ * Function:    H5F__get_sbe_addr_test
  *
  * Purpose:     Retrieve the address of a superblock extension's object header
- *		for a file
+ *              for a file
  *
- * Return:	Success:        Non-negative
- *		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *	        Jul 10, 2016
@@ -219,21 +214,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_get_sbe_addr_test(hid_t file_id, haddr_t *sbe_addr)
+H5F__get_sbe_addr_test(hid_t file_id, haddr_t *sbe_addr)
 {
-    H5F_t	*file;                  /* File info */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5F_t      *file;                       /* File info */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Retrieve maxaddr for file */
     *sbe_addr = file->shared->sblock->ext_addr;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_get_sbe_addr_test() */
+} /* end H5F__get_sbe_addr_test() */