mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r19539] Bug 1707 - I added some comments.

Browse Source 
Tested on jam - simple change.
This commit is contained in:
Raymond Lu 2010-10-07 15:00:57 -05:00
parent 011db9e56c
commit 9df4fe0a87
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/H5E.c
View File

@ -180,9 +180,9 @@ H5E_set_default_auto(H5E_t *stk)
stk->auto_op.func1 = stk->auto_op.func1_default = (H5E_auto1_t)H5Eprint1;
stk->auto_op.func2 = stk->auto_op.func2_default = (H5E_auto2_t)H5Eprint2;
stk->auto_op.is_default = TRUE;
#else
#else /* H5_NO_DEPRECATED_SYMBOLS */
stk->auto_op.func2 = (H5E_auto2_t)H5Eprint2;
#endif
#endif /* H5_NO_DEPRECATED_SYMBOLS */
stk->auto_data = NULL;
@ -1595,7 +1595,7 @@ H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data)
/* Fail if the printing function isn't the default(user-set) and set through H5Eset_auto1 */
if(!op.is_default && op.vers == 1)
HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "wrong API function, H5Eset_auto1 has been called")
#endif
#endif /* H5_NO_DEPRECATED_SYMBOLS */
if(func)
*func = op.func2;
@ -1661,7 +1661,7 @@ H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data)
op.is_default = TRUE;
op.vers = 2;
#endif
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Set the automatic error reporting function */
op.func2 = func;

4
src/H5Eint.c
View File

@ -1015,7 +1015,7 @@ H5E_dump_api_stack(hbool_t is_api)
#ifdef H5_NO_DEPRECATED_SYMBOLS
if(estack->auto_op.func2)
(void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
#else
#else /* H5_NO_DEPRECATED_SYMBOLS */
if(estack->auto_op.vers == 1) {
if(estack->auto_op.func1)
(void)((estack->auto_op.func1)(estack->auto_data));
@ -1024,7 +1024,7 @@ H5E_dump_api_stack(hbool_t is_api)
if(estack->auto_op.func2)
(void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
} /* end else */
#endif
#endif /* H5_NO_DEPRECATED_SYMBOLS */
} /* end if */
done:

4
src/H5Epkg.h
View File

@ -77,11 +77,11 @@ typedef struct {
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
#else /* H5_NO_DEPRECATED_SYMBOLS */
typedef struct {
H5E_auto_t func2; /* Only the new style callback function is available. */
} H5E_auto_op_t;
#endif
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */
typedef struct {