diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
| commit | d688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch) | |
| tree | e46dc5152aafe70254b02c330bcf5fa2ecf6d892 /src/H5Edeprec.c | |
| parent | d3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff) | |
| download | hdf5-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/H5Edeprec.c')
| -rw-r--r-- | src/H5Edeprec.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index 30f3ae9..9f6d869 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -389,8 +389,12 @@ H5Eget_auto1(H5E_auto1_t *func, void **client_data) /* Get the automatic error reporting information */ if(H5E_get_auto(estack, &auto_op, client_data) < 0) HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get automatic error info") + + if(auto_op.user_set && auto_op.vers == 2) + HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "wrong API function, H5Eset_auto2 has been called") + if(func) - *func = auto_op.u.func1; + *func = auto_op.func1; done: FUNC_LEAVE_API(ret_value) @@ -436,7 +440,8 @@ H5Eset_auto1(H5E_auto1_t func, void *client_data) /* Set the automatic error reporting information */ auto_op.vers = 1; - auto_op.u.func1 = func; + auto_op.user_set = TRUE; + auto_op.func1 = func; if(H5E_set_auto(estack, &auto_op, client_data) < 0) HGOTO_ERROR(H5E_ERROR, H5E_CANTSET, FAIL, "can't set automatic error info") |