diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 17:53:37 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 17:53:37 (GMT) |
| commit | bb87e6bac6a2d31ab70792eee8ca065860a979f6 (patch) | |
| tree | 3e97bbfd0ab686c6e09c2e69e4b31116d320f79b /src/H5Edeprec.c | |
| parent | 84540ce6d1708e98c152276f524c938435da804c (diff) | |
| download | hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.zip hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.tar.gz hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.tar.bz2 | |
[svn-r19479] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19466.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with
the 1.8 library to compile.
Tested on jam - backing out, simple.
Diffstat (limited to 'src/H5Edeprec.c')
| -rw-r--r-- | src/H5Edeprec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index 9f6d869..30f3ae9 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -389,12 +389,8 @@ 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.func1; + *func = auto_op.u.func1; done: FUNC_LEAVE_API(ret_value) @@ -440,8 +436,7 @@ H5Eset_auto1(H5E_auto1_t func, void *client_data) /* Set the automatic error reporting information */ auto_op.vers = 1; - auto_op.user_set = TRUE; - auto_op.func1 = func; + auto_op.u.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") |