diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2013-04-01 20:42:58 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2013-04-01 20:42:58 (GMT) |
| commit | 95332ad1770877b3b4558eb91a2dae4a0dd5aab1 (patch) | |
| tree | ced08b53e3c6474b4a6656d4c3399f1d96b4b40d /src/H5Einit.h | |
| parent | 91bcf7432e992d58741fe1925bb93bf32feb3358 (diff) | |
| download | hdf5-95332ad1770877b3b4558eb91a2dae4a0dd5aab1.zip hdf5-95332ad1770877b3b4558eb91a2dae4a0dd5aab1.tar.gz hdf5-95332ad1770877b3b4558eb91a2dae4a0dd5aab1.tar.bz2 | |
[svn-r23510] I merged the changes for DESY project from the trunk (r23496) into this 1.8 DESY branch.
Tested with h5committest (duck failed with CMake because I don't know how to change test/CMakeLists.txt. I'll wait for Allen to do it).
Diffstat (limited to 'src/H5Einit.h')
| -rw-r--r-- | src/H5Einit.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/H5Einit.h b/src/H5Einit.h index 4d72335..9dadd41 100644 --- a/src/H5Einit.h +++ b/src/H5Einit.h @@ -54,6 +54,11 @@ if((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_PLUGIN_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MAJOR, "Plugin for dynamically loaded library"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_PLUGIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") assert(H5E_VFL_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") @@ -467,6 +472,13 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "No error"))==NULL) if((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +/* Plugin errors */ +assert(H5E_OPENERROR_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") + /* File accessibilty errors */ assert(H5E_FILEEXISTS_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists"))==NULL) |