summaryrefslogtreecommitdiffstats
path: root/src/H5Epublic.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-09-30 16:20:46 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-09-30 16:20:46 (GMT)
commitc58d85f10eb0f7da7ac920b0655937f7521e9d8c (patch)
tree5920e9682efd3a548fa78ed67735efa153dfcef0 /src/H5Epublic.h
parentc48165cb11b0cb9a06239a0268c1c97336ffe6fd (diff)
downloadhdf5-c58d85f10eb0f7da7ac920b0655937f7521e9d8c.zip
hdf5-c58d85f10eb0f7da7ac920b0655937f7521e9d8c.tar.gz
hdf5-c58d85f10eb0f7da7ac920b0655937f7521e9d8c.tar.bz2
[svn-r7527] Purpose:
Code cleanup Description: Clean up a few loose ends and warnings for the 1.6 compatibility changes to the error API. Platforms tested: FreeBSD 4.9 (sleipnir) too minor to require h5committest
Diffstat (limited to 'src/H5Epublic.h')
-rw-r--r--src/H5Epublic.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 49da51e..e9cf481 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -157,10 +157,11 @@ extern "C" {
#endif
/* Error stack traversal callback function pointers */
-typedef herr_t (*H5E_walk_t)(unsigned n, const H5E_error_t *err_desc, void *client_data);
#ifdef H5_WANT_H5_V1_6_COMPAT
+typedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void *client_data);
typedef herr_t (*H5E_auto_t)(void *client_data);
#else
+typedef herr_t (*H5E_walk_t)(unsigned n, const H5E_error_t *err_desc, void *client_data);
typedef herr_t (*H5E_auto_t)(hid_t estack, void *client_data);
#endif /* H5_WANT_H5_V1_6_COMPAT */
@@ -172,6 +173,7 @@ H5_DLL hid_t H5Ecreate_msg(hid_t cls, H5E_type_t msg_type, const char *msg);
H5_DLL hid_t H5Eget_current_stack(void);
H5_DLL herr_t H5Eclose_stack(hid_t stack_id);
H5_DLL ssize_t H5Eget_class_name(hid_t class_id, char *name, size_t size);
+H5_DLL ssize_t H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg, size_t size);
H5_DLL int H5Eget_num(hid_t error_stack_id);
H5_DLL herr_t H5Eset_current_stack(hid_t err_stack_id);
H5_DLL herr_t H5Epop(hid_t err_stack, size_t count);
@@ -195,7 +197,6 @@ H5_DLL herr_t H5Ewalk(hid_t err_stack, H5E_direction_t direction, H5E_walk_t fu
H5_DLL herr_t H5Eget_auto(hid_t estack_id, H5E_auto_t *func, void **client_data);
H5_DLL herr_t H5Eset_auto(hid_t estack_id, H5E_auto_t func, void *client_data);
H5_DLL herr_t H5Eclear(hid_t err_stack);
-H5_DLL ssize_t H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg, size_t size);
#endif /* H5_WANT_H5_V1_6_COMPAT */
#ifdef __cplusplus
}