summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2003-05-07 22:30:56 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2003-05-07 22:30:56 (GMT)
commit546dea5dd91434a5c68f89a95e47c541c9ddb637 (patch)
tree035742e699568931667dd2635b2c75984358dcda
parent401c1bc31813f5b44d575823a2c28175bb4e86a0 (diff)
downloadhdf5-546dea5dd91434a5c68f89a95e47c541c9ddb637.zip
hdf5-546dea5dd91434a5c68f89a95e47c541c9ddb637.tar.gz
hdf5-546dea5dd91434a5c68f89a95e47c541c9ddb637.tar.bz2
[svn-r6828] Purpose: bug fix
Description: H5T_XXX_init_interface calls H5T_init_interface causing datatype not closed after file is closed. Solution: changed H5T_init_interface to H5T_init Platforms tested: h5committest
-rw-r--r--src/H5T.c4
-rw-r--r--src/H5Tarray.c2
-rw-r--r--src/H5Tcommit.c2
-rw-r--r--src/H5Tcompound.c2
-rw-r--r--src/H5Tcset.c2
-rw-r--r--src/H5Tenum.c2
-rw-r--r--src/H5Tfields.c2
-rw-r--r--src/H5Tfixed.c2
-rw-r--r--src/H5Tfloat.c2
-rw-r--r--src/H5Tnative.c2
-rw-r--r--src/H5Toffset.c2
-rw-r--r--src/H5Topaque.c2
-rw-r--r--src/H5Torder.c2
-rw-r--r--src/H5Tpad.c2
-rw-r--r--src/H5Tprecis.c2
-rw-r--r--src/H5Tstrpad.c2
-rw-r--r--src/H5Tvlen.c2
17 files changed, 18 insertions, 18 deletions
diff --git a/src/H5T.c b/src/H5T.c
index 9ab8111..c3cb76a 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1890,7 +1890,7 @@ H5T_unlock_cb (void *_dt, hid_t UNUSED id, const void UNUSED *key)
int
H5T_term_interface(void)
{
- int i, nprint=0, n=0;
+ int i, j, nprint=0, n=0;
H5T_path_t *path = NULL;
FUNC_ENTER_NOINIT(H5T_term_interface);
@@ -1900,7 +1900,6 @@ H5T_term_interface(void)
for (i=0; i<H5T_g.npaths; i++) {
path = H5T_g.path[i];
assert (path);
-
if (path->func) {
H5T_print_stats(path, &nprint/*in,out*/);
path->cdata.command = H5T_CONV_FREE;
@@ -1917,6 +1916,7 @@ H5T_term_interface(void)
H5E_clear(); /*ignore the error*/
}
}
+
H5T_close (path->src);
H5T_close (path->dst);
H5FL_FREE(H5T_path_t,path);
diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index a9b2d10..46dc4a0 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -54,7 +54,7 @@ H5T_init_array_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_array_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_array_interface() */
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 1360408..1b2b64c 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -54,7 +54,7 @@ H5T_init_commit_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_commit_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_commit_interface() */
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index 8326ffe..6621c7e 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -58,7 +58,7 @@ H5T_init_compound_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_compound_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_compound_interface() */
diff --git a/src/H5Tcset.c b/src/H5Tcset.c
index 0ddfe23..cb58afb 100644
--- a/src/H5Tcset.c
+++ b/src/H5Tcset.c
@@ -50,7 +50,7 @@ H5T_init_cset_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_cset_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_cset_interface() */
diff --git a/src/H5Tenum.c b/src/H5Tenum.c
index dcd7ff7..95c514f 100644
--- a/src/H5Tenum.c
+++ b/src/H5Tenum.c
@@ -61,7 +61,7 @@ H5T_init_enum_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_enum_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_enum_interface() */
diff --git a/src/H5Tfields.c b/src/H5Tfields.c
index b14d6d3..b14a53d 100644
--- a/src/H5Tfields.c
+++ b/src/H5Tfields.c
@@ -51,7 +51,7 @@ H5T_init_fields_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_fields_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_fields_interface() */
diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c
index fbcc1b0..99bc12b 100644
--- a/src/H5Tfixed.c
+++ b/src/H5Tfixed.c
@@ -50,7 +50,7 @@ H5T_init_fixed_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_fixed_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_fixed_interface() */
diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c
index a0ecac1..1211d2b 100644
--- a/src/H5Tfloat.c
+++ b/src/H5Tfloat.c
@@ -50,7 +50,7 @@ H5T_init_float_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_float_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_float_interface() */
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 42fb378..a143496 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -61,7 +61,7 @@ H5T_init_native_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_native_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_native_interface() */
diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index 63cffea..72d15fb 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -53,7 +53,7 @@ H5T_init_offset_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_offset_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_offset_interface() */
diff --git a/src/H5Topaque.c b/src/H5Topaque.c
index 1d1fec2..17f4e36 100644
--- a/src/H5Topaque.c
+++ b/src/H5Topaque.c
@@ -51,7 +51,7 @@ H5T_init_opaque_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_opaque_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_opaque_interface() */
diff --git a/src/H5Torder.c b/src/H5Torder.c
index 4e2f167..35e9c0d 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -50,7 +50,7 @@ H5T_init_order_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_order_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_order_interface() */
diff --git a/src/H5Tpad.c b/src/H5Tpad.c
index 4f69d9e..afceade 100644
--- a/src/H5Tpad.c
+++ b/src/H5Tpad.c
@@ -50,7 +50,7 @@ H5T_init_pad_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_pad_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_pad_interface() */
diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c
index 60a82aa..a692069 100644
--- a/src/H5Tprecis.c
+++ b/src/H5Tprecis.c
@@ -53,7 +53,7 @@ H5T_init_precis_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_precis_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_precis_interface() */
diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c
index ae8167c..27936e7 100644
--- a/src/H5Tstrpad.c
+++ b/src/H5Tstrpad.c
@@ -50,7 +50,7 @@ H5T_init_strpad_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_strpad_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_strpad_interface() */
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 2b9ea47..e0eddf5 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -61,7 +61,7 @@ H5T_init_vlen_interface(void)
{
FUNC_ENTER_NOINIT(H5T_init_vlen_interface);
- FUNC_LEAVE_NOAPI(H5T_init_interface());
+ FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_vlen_interface() */