summaryrefslogtreecommitdiffstats
path: root/src/H5Einit.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-03-11 02:33:09 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-03-11 02:33:09 (GMT)
commit45a16682e29fdb5d7bf071ebb6d52cca157e1718 (patch)
tree10833d71b36dba1d688d056a54f5491755f185e3 /src/H5Einit.h
parent4d86e9e8b87f5abd5d1c6fcfbcef738d36db387f (diff)
downloadhdf5-45a16682e29fdb5d7bf071ebb6d52cca157e1718.zip
hdf5-45a16682e29fdb5d7bf071ebb6d52cca157e1718.tar.gz
hdf5-45a16682e29fdb5d7bf071ebb6d52cca157e1718.tar.bz2
[svn-r10187] Purpose:
Code cleanup, mostly Description: Remove remaining TBBT error info Add new error code for block tracker Platforms tested: FreeBSD 4.11 (sleipnir) Solaris 2.9 (shanti)
Diffstat (limited to 'src/H5Einit.h')
-rw-r--r--src/H5Einit.h19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/H5Einit.h b/src/H5Einit.h
index bb8a04d..7471494 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -108,11 +108,6 @@ if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_TBBT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Threaded, Balanced, Binary Trees"))==NULL)
- HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TBBT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
- HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
assert(H5E_ATOM_g==(-1));
if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom"))==NULL)
HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
@@ -174,13 +169,6 @@ if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
/*********************/
-/* Threaded, balanced binary tree errors */
-assert(H5E_CANTMAKETREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't create a binary tree node"))==NULL)
- HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMAKETREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
- HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
/* Generic low-level file I/O errors */
assert(H5E_SEEKERROR_g==(-1));
if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL)
@@ -547,6 +535,13 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+/* Block tracker errors */
+assert(H5E_OVERLAPS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Blocks overlap"))==NULL)
+ HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_OVERLAPS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+ HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
/* Dataspace errors */
assert(H5E_CANTCLIP_g==(-1));
if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL)