[svn-r27984] merge from trunk.. not working yet.

1 files changed, 15 insertions, 18 deletions

diff --git a/src/H5V.c b/src/H5V.c
index 8cb00ce..4a61077 100644
--- a/src/H5V.c
+++ b/src/H5V.c
@@ -17,8 +17,7 @@
 /* Module Setup */
 /****************/
 
-/* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5V_init_interface
+#include "H5Vmodule.h"          /* This source code file is part of the H5V module */
 
 
 /***********/
@@ -60,6 +59,8 @@
 /* Package Variables */
 /*********************/
 
+/* Package initialization variable */
+hbool_t H5_PKG_INIT_VAR = FALSE;
 
 /*****************************/
 /* Library Private Variables */
@@ -108,9 +109,9 @@ done:
 
 /*--------------------------------------------------------------------------
 NAME
-   H5V_init_interface -- Initialize interface-specific information
+   H5V__init_package -- Initialize interface-specific information
 USAGE
-    herr_t H5V_init_interface()
+    herr_t H5V__init_package()
 
 RETURNS
     Non-negative on success/Negative on failure
@@ -119,7 +120,7 @@ DESCRIPTION
 
 --------------------------------------------------------------------------*/
 static herr_t
-H5V_init_interface(void)
+H5V__init_package(void)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
@@ -133,16 +134,16 @@ H5V_init_interface(void)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5V_init_interface() */
+} /* end H5V__init_package() */
 
 
 /*--------------------------------------------------------------------------
  NAME
-    H5V_term_interface
+    H5V_term_package
  PURPOSE
     Terminate various H5V objects
  USAGE
-    void H5V_term_interface()
+    void H5V_term_package()
  RETURNS
  DESCRIPTION
     Release any other resources allocated.
@@ -153,29 +154,25 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 int
-H5V_term_interface(void)
+H5V_term_package(void)
 {
     int	n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
+    if(H5_PKG_INIT_VAR) {
 	if(H5I_nmembers(H5I_VIEW) > 0) {
 	    (void)H5I_clear_type(H5I_VIEW, FALSE, FALSE);
             n++; /*H5I*/
 	} /* end if */
-        else {
-            /* Destroy the dataspace object id group */
-	    (void)H5I_dec_type_ref(H5I_VIEW);
-            n++; /*H5I*/
 
-	    /* Shut down interface */
-	    H5_interface_initialize_g = 0;
-	} /* end else */
+        /* Mark interface as closed */
+        if(0 == n)
+	    H5_PKG_INIT_VAR = FALSE;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(n)
-} /* H5V_term_interface() */
+} /* H5V_term_package() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_view_elmt_scope