diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-10-04 18:46:37 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-10-04 18:46:37 (GMT) |
| commit | 4b5ae88422348a6c99750dd2a8d0178f78743b25 (patch) | |
| tree | 1d75352b49f0f69ba0817fe9d7acfb8d4317b1f0 /src/H5Epkg.h | |
| parent | 82c6eab1814e1e06ef9472f6f4bbc8522064e0bc (diff) | |
| download | hdf5-4b5ae88422348a6c99750dd2a8d0178f78743b25.zip hdf5-4b5ae88422348a6c99750dd2a8d0178f78743b25.tar.gz hdf5-4b5ae88422348a6c99750dd2a8d0178f78743b25.tar.bz2 | |
[svn-r19507] Fix for bug 1707 - I changed the design from the previous fix as Quincey suggested. I added a
flag IS_DEDAULT in the H5E_auto_t structure. Both H5Eprint1/2 are the default now. If the user
sets his/her own printing function. Then a call to H5Eget_auto1/2 will have to match
H5Eset_auto1/2.
Tested on jam, heiwa, and amani.
Diffstat (limited to 'src/H5Epkg.h')
| -rw-r--r-- | src/H5Epkg.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/H5Epkg.h b/src/H5Epkg.h index b9688d2..93e0d82 100644 --- a/src/H5Epkg.h +++ b/src/H5Epkg.h @@ -71,15 +71,18 @@ #ifndef H5_NO_DEPRECATED_SYMBOLS typedef struct { unsigned vers; /* Which version callback to use */ - hbool_t user_set; /* If the printing function has been set. */ + hbool_t is_default; /* If the printing function is the library's own. */ H5E_auto1_t func1; /* Old-style callback, NO error stack param. */ H5E_auto2_t func2; /* New-style callback, with error stack param. */ + H5E_auto1_t func1_default; /* The saved library's default function - old style. */ + H5E_auto2_t func2_default; /* The saved library's default function - new style. */ } H5E_auto_op_t; #else typedef struct { unsigned vers; /* Which version callback to use */ - hbool_t user_set; /* If the printing function has been set. */ + hbool_t is_default; /* If the printing function is the library's own. */ H5E_auto_t func2; /* Only the new style callback function is available. */ + H5E_auto2_t func2_default; /* The saved library's default function - new style. */ } H5E_auto_op_t; #endif |