summaryrefslogtreecommitdiffstats
path: root/src/H5E.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-20 21:57:57 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-20 21:57:57 (GMT)
commitd688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch)
treee46dc5152aafe70254b02c330bcf5fa2ecf6d892 /src/H5E.c
parentd3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff)
downloadhdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.zip
hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.gz
hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.bz2
[svn-r19441] Bug fix for 1707 - in a hurry, explain later.
tested on jam and amani, heiwa hasn't finished yet.
Diffstat (limited to 'src/H5E.c')
-rw-r--r--src/H5E.c25
1 files changed, 18 insertions, 7 deletions
diff --git a/src/H5E.c b/src/H5E.c
index 1a260a2..0bbb0cb 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -170,13 +170,19 @@ H5E_set_default_auto(H5E_t *stk)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_default_auto)
-#ifdef H5_USE_16_API
+#ifdef H5_USE_16_API_DEFAULT
stk->auto_op.vers = 1;
- stk->auto_op.u.func1 = (H5E_auto1_t)H5Eprint1;
-#else /* H5_USE_16_API */
+#else /* H5_USE_16_API_DEFAULT */
stk->auto_op.vers = 2;
- stk->auto_op.u.func2 = (H5E_auto2_t)H5Eprint2;
-#endif /* H5_USE_16_API */
+#endif /* H5_USE_16_API_DEFAULT */
+#ifdef H5_NO_DEPRECATED_SYMBOLS
+ stk->auto_op.vers = 2;
+ stk->auto_op.func1 = NULL;
+#else
+ stk->auto_op.func1 = (H5E_auto1_t)H5Eprint1;
+#endif
+ stk->auto_op.func2 = (H5E_auto2_t)H5Eprint2;
+ stk->auto_op.user_set = FALSE;
stk->auto_data = NULL;
FUNC_LEAVE_NOAPI(SUCCEED)
@@ -1573,8 +1579,12 @@ H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data)
/* Get the automatic error reporting information */
if(H5E_get_auto(estack, &op, client_data) < 0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get automatic error info")
+
+ if(op.user_set && op.vers == 1)
+ HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "wrong API function, H5Eset_auto1 has been called")
+
if(func)
- *func = op.u.func2;
+ *func = op.func2;
done:
FUNC_LEAVE_API(ret_value)
@@ -1624,7 +1634,8 @@ H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data)
/* Set the automatic error reporting information */
op.vers = 2;
- op.u.func2 = func;
+ op.user_set = TRUE;
+ op.func2 = func;
if(H5E_set_auto(estack, &op, client_data) < 0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't set automatic error info")