[svn-r8981] Purpose:

    Code cleanup

Description:
    Various minor tweaks to clean code up and bring it into closer
syncronization with the release branch.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    h5committested
    IRIX64 6.5 (modi4)

21 files changed, 683 insertions, 723 deletions

diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index bf60dd1..35d5a23 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -143,7 +143,7 @@ H5D_contig_fill(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
         if (MPI_COMM_NULL == (mpi_comm=H5F_mpi_get_comm(f)))
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI communicator");
 
-        /* Get the MPI rank & size */
+        /* Get the MPI rank */
         if ((mpi_rank=H5F_mpi_get_rank(f))<0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
 
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 517838d..ea15076 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -267,4 +267,3 @@ H5D_mpio_spaces_write(H5F_t *f, const H5D_dxpl_cache_t UNUSED *dxpl_cache, hid_t
 } /* end H5D_mpio_spaces_write() */
 
 #endif  /* H5_HAVE_PARALLEL */
-
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index dfd9714..fc629bb 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -20,63 +20,70 @@
 #define _H5Edefin_H
 
 /* Major error IDs */
-hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
-hid_t H5E_EFL_g            = FAIL;      /* External file list */
-hid_t H5E_REFERENCE_g      = FAIL;      /* References */
-hid_t H5E_FPHDF5_g         = FAIL;      /* Flexible Parallel HDF5 */
-hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
-hid_t H5E_ERROR_g          = FAIL;      /* Error API */
 hid_t H5E_DATASET_g        = FAIL;      /* Dataset */
-hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
-hid_t H5E_TBBT_g           = FAIL;      /* Threaded, Balanced, Binary Trees */
-hid_t H5E_OHDR_g           = FAIL;      /* Object header */
+hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
 hid_t H5E_STORAGE_g        = FAIL;      /* Data storage */
 hid_t H5E_FILE_g           = FAIL;      /* File accessability */
-hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
-hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
-hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
-hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
-hid_t H5E_CACHE_g          = FAIL;      /* Object cache */
+hid_t H5E_FPHDF5_g         = FAIL;      /* Flexible Parallel HDF5 */
 hid_t H5E_SYM_g            = FAIL;      /* Symbol table */
-hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
 hid_t H5E_VFL_g            = FAIL;      /* Virtual File Layer */
+hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
+hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
+hid_t H5E_REFERENCE_g      = FAIL;      /* References */
+hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
+hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
 hid_t H5E_PLIST_g          = FAIL;      /* Property lists */
+hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
+hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
+hid_t H5E_HEAP_g           = FAIL;      /* Heap */
+hid_t H5E_OHDR_g           = FAIL;      /* Object header */
+hid_t H5E_TBBT_g           = FAIL;      /* Threaded, Balanced, Binary Trees */
+hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
 hid_t H5E_ATTR_g           = FAIL;      /* Attribute */
 hid_t H5E_IO_g             = FAIL;      /* Low-level I/O */
+hid_t H5E_EFL_g            = FAIL;      /* External file list */
+hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
 hid_t H5E_ARGS_g           = FAIL;      /* Invalid arguments to routine */
-hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
+hid_t H5E_ERROR_g          = FAIL;      /* Error API */
 hid_t H5E_PLINE_g          = FAIL;      /* Data filters */
-hid_t H5E_HEAP_g           = FAIL;      /* Heap */
+hid_t H5E_CACHE_g          = FAIL;      /* Object cache */
 
 /* Minor error IDs */
 
+/* Generic low-level file I/O errors */
+hid_t H5E_SEEKERROR_g      = FAIL;      /* Seek failed */
+hid_t H5E_READERROR_g      = FAIL;      /* Read failed */
+hid_t H5E_WRITEERROR_g     = FAIL;      /* Write failed */
+hid_t H5E_CLOSEERROR_g     = FAIL;      /* Close failed */
+hid_t H5E_OVERFLOW_g       = FAIL;      /* Address overflowed */
+hid_t H5E_FCNTL_g          = FAIL;      /* File control (fcntl) failed */
+
+/* Resource errors */
+hid_t H5E_NOSPACE_g        = FAIL;      /* No space available for allocation */
+hid_t H5E_CANTCOPY_g       = FAIL;      /* Unable to copy object */
+hid_t H5E_CANTFREE_g       = FAIL;      /* Unable to free object */
+hid_t H5E_ALREADYEXISTS_g  = FAIL;      /* Object already exists */
+hid_t H5E_CANTLOCK_g       = FAIL;      /* Unable to lock object */
+hid_t H5E_CANTUNLOCK_g     = FAIL;      /* Unable to unlock object */
+hid_t H5E_CANTGC_g         = FAIL;      /* Unable to garbage collect */
+hid_t H5E_CANTGETSIZE_g    = FAIL;      /* Unable to compute size */
+
+/* Function entry/exit interface errors */
+hid_t H5E_CANTINIT_g       = FAIL;      /* Unable to initialize object */
+hid_t H5E_ALREADYINIT_g    = FAIL;      /* Object already initialized */
+hid_t H5E_CANTRELEASE_g    = FAIL;      /* Unable to release object */
+
 /* Property list errors */
 hid_t H5E_CANTGET_g        = FAIL;      /* Can't get value */
 hid_t H5E_CANTSET_g        = FAIL;      /* Can't set value */
 hid_t H5E_DUPCLASS_g       = FAIL;      /* Duplicate class name in parent class */
 
-/* Dataspace errors */
-hid_t H5E_CANTCLIP_g       = FAIL;      /* Can't clip hyperslab region */
-hid_t H5E_CANTCOUNT_g      = FAIL;      /* Can't count elements */
-hid_t H5E_CANTSELECT_g     = FAIL;      /* Can't select hyperslab */
-hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location */
-hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
-hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
-
-/* Object atom related errors */
-hid_t H5E_BADATOM_g        = FAIL;      /* Unable to find atom information (already closed?) */
-hid_t H5E_BADGROUP_g       = FAIL;      /* Unable to find ID group information */
-hid_t H5E_CANTREGISTER_g   = FAIL;      /* Unable to register new atom */
-hid_t H5E_CANTINC_g        = FAIL;      /* Unable to increment reference count */
-hid_t H5E_CANTDEC_g        = FAIL;      /* Unable to decrement reference count */
-hid_t H5E_NOIDS_g          = FAIL;      /* Out of IDs for group */
-
-/* Argument errors */
-hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
-hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
-hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
-hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
-hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
+/* Object header related errors */
+hid_t H5E_LINKCOUNT_g      = FAIL;      /* Bad object header link count */
+hid_t H5E_VERSION_g        = FAIL;      /* Wrong version number */
+hid_t H5E_ALIGNMENT_g      = FAIL;      /* Alignment error */
+hid_t H5E_BADMESG_g        = FAIL;      /* Unrecognized message */
+hid_t H5E_CANTDELETE_g     = FAIL;      /* Can't delete message */
 
 /* FPHDF5 errors */
 hid_t H5E_CANTMAKETREE_g   = FAIL;      /* Can't create a binary tree node */
@@ -92,47 +99,13 @@ hid_t H5E_CANAPPLY_g       = FAIL;      /* Error from filter 'can apply' callbac
 hid_t H5E_SETLOCAL_g       = FAIL;      /* Error from filter 'set local' callback */
 hid_t H5E_NOENCODER_g      = FAIL;      /* Filter present but encoding disabled */
 
-/* Datatype conversion errors */
-hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
-hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
-
-/* Parallel MPI errors */
-hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
-hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
-
-/* Object header related errors */
-hid_t H5E_LINKCOUNT_g      = FAIL;      /* Bad object header link count */
-hid_t H5E_VERSION_g        = FAIL;      /* Wrong version number */
-hid_t H5E_ALIGNMENT_g      = FAIL;      /* Alignment error */
-hid_t H5E_BADMESG_g        = FAIL;      /* Unrecognized message */
-hid_t H5E_CANTDELETE_g     = FAIL;      /* Can't delete message */
-
-/* Resource errors */
-hid_t H5E_NOSPACE_g        = FAIL;      /* No space available for allocation */
-hid_t H5E_CANTCOPY_g       = FAIL;      /* Unable to copy object */
-hid_t H5E_CANTFREE_g       = FAIL;      /* Unable to free object */
-hid_t H5E_ALREADYEXISTS_g  = FAIL;      /* Object already exists */
-hid_t H5E_CANTLOCK_g       = FAIL;      /* Unable to lock object */
-hid_t H5E_CANTUNLOCK_g     = FAIL;      /* Unable to unlock object */
-hid_t H5E_CANTGC_g         = FAIL;      /* Unable to garbage collect */
-hid_t H5E_CANTGETSIZE_g    = FAIL;      /* Unable to compute size */
-
-/* Generic low-level file I/O errors */
-hid_t H5E_SEEKERROR_g      = FAIL;      /* Seek failed */
-hid_t H5E_READERROR_g      = FAIL;      /* Read failed */
-hid_t H5E_WRITEERROR_g     = FAIL;      /* Write failed */
-hid_t H5E_CLOSEERROR_g     = FAIL;      /* Close failed */
-hid_t H5E_OVERFLOW_g       = FAIL;      /* Address overflowed */
-hid_t H5E_FCNTL_g          = FAIL;      /* File control (fcntl) failed */
-
-/* B-tree related errors */
-hid_t H5E_NOTFOUND_g       = FAIL;      /* Object not found */
-hid_t H5E_EXISTS_g         = FAIL;      /* Object already exists */
-hid_t H5E_CANTENCODE_g     = FAIL;      /* Unable to encode value */
-hid_t H5E_CANTDECODE_g     = FAIL;      /* Unable to decode value */
-hid_t H5E_CANTSPLIT_g      = FAIL;      /* Unable to split node */
-hid_t H5E_CANTINSERT_g     = FAIL;      /* Unable to insert object */
-hid_t H5E_CANTLIST_g       = FAIL;      /* Unable to list node */
+/* Group related errors */
+hid_t H5E_CANTOPENOBJ_g    = FAIL;      /* Can't open object */
+hid_t H5E_CANTCLOSEOBJ_g   = FAIL;      /* Can't close object */
+hid_t H5E_COMPLEN_g        = FAIL;      /* Name component is too long */
+hid_t H5E_CWG_g            = FAIL;      /* Problem with current working group */
+hid_t H5E_LINK_g           = FAIL;      /* Link count failure */
+hid_t H5E_SLINK_g          = FAIL;      /* Symbolic link error */
 
 /* File accessability errors */
 hid_t H5E_FILEEXISTS_g     = FAIL;      /* File already exists */
@@ -145,6 +118,14 @@ hid_t H5E_BADFILE_g        = FAIL;      /* Bad file ID accessed */
 hid_t H5E_TRUNCATED_g      = FAIL;      /* File has been truncated */
 hid_t H5E_MOUNT_g          = FAIL;      /* File mount error */
 
+/* Object atom related errors */
+hid_t H5E_BADATOM_g        = FAIL;      /* Unable to find atom information (already closed?) */
+hid_t H5E_BADGROUP_g       = FAIL;      /* Unable to find ID group information */
+hid_t H5E_CANTREGISTER_g   = FAIL;      /* Unable to register new atom */
+hid_t H5E_CANTINC_g        = FAIL;      /* Unable to increment reference count */
+hid_t H5E_CANTDEC_g        = FAIL;      /* Unable to decrement reference count */
+hid_t H5E_NOIDS_g          = FAIL;      /* Out of IDs for group */
+
 /* Cache related errors */
 hid_t H5E_CANTFLUSH_g      = FAIL;      /* Unable to flush data from cache */
 hid_t H5E_CANTSERIALIZE_g  = FAIL;      /* Unable to serialize data from cache */
@@ -157,17 +138,36 @@ hid_t H5E_CANTRENAME_g     = FAIL;      /* Unable to rename metadata */
 hid_t H5E_CANTPROTECT_g    = FAIL;      /* Unable to protect metadata */
 hid_t H5E_CANTUNPROTECT_g  = FAIL;      /* Unable to unprotect metadata */
 
-/* Group related errors */
-hid_t H5E_CANTOPENOBJ_g    = FAIL;      /* Can't open object */
-hid_t H5E_CANTCLOSEOBJ_g   = FAIL;      /* Can't close object */
-hid_t H5E_COMPLEN_g        = FAIL;      /* Name component is too long */
-hid_t H5E_CWG_g            = FAIL;      /* Problem with current working group */
-hid_t H5E_LINK_g           = FAIL;      /* Link count failure */
-hid_t H5E_SLINK_g          = FAIL;      /* Symbolic link error */
+/* Parallel MPI errors */
+hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
+hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
 
-/* Function entry/exit interface errors */
-hid_t H5E_CANTINIT_g       = FAIL;      /* Unable to initialize object */
-hid_t H5E_ALREADYINIT_g    = FAIL;      /* Object already initialized */
-hid_t H5E_CANTRELEASE_g    = FAIL;      /* Unable to release object */
+/* Dataspace errors */
+hid_t H5E_CANTCLIP_g       = FAIL;      /* Can't clip hyperslab region */
+hid_t H5E_CANTCOUNT_g      = FAIL;      /* Can't count elements */
+hid_t H5E_CANTSELECT_g     = FAIL;      /* Can't select hyperslab */
+hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location */
+hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
+hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
+
+/* B-tree related errors */
+hid_t H5E_NOTFOUND_g       = FAIL;      /* Object not found */
+hid_t H5E_EXISTS_g         = FAIL;      /* Object already exists */
+hid_t H5E_CANTENCODE_g     = FAIL;      /* Unable to encode value */
+hid_t H5E_CANTDECODE_g     = FAIL;      /* Unable to decode value */
+hid_t H5E_CANTSPLIT_g      = FAIL;      /* Unable to split node */
+hid_t H5E_CANTINSERT_g     = FAIL;      /* Unable to insert object */
+hid_t H5E_CANTLIST_g       = FAIL;      /* Unable to list node */
+
+/* Argument errors */
+hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
+hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
+hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
+hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
+hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
+
+/* Datatype conversion errors */
+hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
+hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
 
 #endif /* H5Edefin_H */
diff --git a/src/H5Einit.h b/src/H5Einit.h
index 400f82c..0e43071 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -23,110 +23,100 @@
 /* Major error codes */
 /*********************/
 
-assert(H5E_BTREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node"))==NULL)
+assert(H5E_DATASET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_EFL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list"))==NULL)
+assert(H5E_FUNC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_REFERENCE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "References"))==NULL)
+assert(H5E_STORAGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessability"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 assert(H5E_FPHDF5_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Flexible Parallel HDF5"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_FPHDF5_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_INTERNAL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API"))==NULL)
+assert(H5E_SYM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DATASET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset"))==NULL)
+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")
-if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_VFL_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)
+assert(H5E_INTERNAL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_INTERNAL_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)
+assert(H5E_BTREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TBBT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_OHDR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
+assert(H5E_REFERENCE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "References"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_STORAGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage"))==NULL)
+assert(H5E_DATASPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessability"))==NULL)
+assert(H5E_RESOURCE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_RS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings"))==NULL)
+assert(H5E_PLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 assert(H5E_DATATYPE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_TST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_RESOURCE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CACHE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache"))==NULL)
+assert(H5E_RS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SYM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table"))==NULL)
+assert(H5E_HEAP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FUNC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit"))==NULL)
+assert(H5E_OHDR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+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_VFL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer"))==NULL)
+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_VFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+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_PLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists"))==NULL)
+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")
-if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 assert(H5E_ATTR_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute"))==NULL)
@@ -138,25 +128,35 @@ if((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_EFL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_TST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 assert(H5E_ARGS_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Invalid arguments to routine"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DATASPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace"))==NULL)
+assert(H5E_ERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 assert(H5E_PLINE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_HEAP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap"))==NULL)
+assert(H5E_CACHE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /*********************/
@@ -164,112 +164,139 @@ if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
 /*********************/
 
 
-/* Property list errors */
-assert(H5E_CANTGET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value"))==NULL)
+/* Generic low-level file I/O errors */
+assert(H5E_SEEKERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value"))==NULL)
+assert(H5E_READERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DUPCLASS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class"))==NULL)
+assert(H5E_WRITEERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CLOSEERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_OVERFLOW_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FCNTL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FCNTL_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)
+/* Resource errors */
+assert(H5E_NOSPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements"))==NULL)
+assert(H5E_CANTCOPY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSELECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab"))==NULL)
+assert(H5E_CANTFREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTNEXT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location"))==NULL)
+assert(H5E_ALREADYEXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADSELECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection"))==NULL)
+assert(H5E_CANTLOCK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOMPARE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
+assert(H5E_CANTUNLOCK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTGC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTGETSIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Object atom related errors */
-assert(H5E_BADATOM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)"))==NULL)
+/* Function entry/exit interface errors */
+assert(H5E_CANTINIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADGROUP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information"))==NULL)
+assert(H5E_ALREADYINIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTREGISTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom"))==NULL)
+assert(H5E_CANTRELEASE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTINC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count"))==NULL)
+
+/* Property list errors */
+assert(H5E_CANTGET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDEC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count"))==NULL)
+assert(H5E_CANTSET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NOIDS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group"))==NULL)
+assert(H5E_DUPCLASS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Argument errors */
-assert(H5E_UNINITIALIZED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
+/* Object header related errors */
+assert(H5E_LINKCOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_UNSUPPORTED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
+assert(H5E_VERSION_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADTYPE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
+assert(H5E_ALIGNMENT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADRANGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
+assert(H5E_BADMESG_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADVALUE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
+assert(H5E_CANTDELETE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* FPHDF5 errors */
@@ -326,166 +353,36 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled")
 if((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Datatype conversion errors */
-assert(H5E_CANTCONVERT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADSIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Parallel MPI errors */
-assert(H5E_MPI_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_MPIERRSTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Object header related errors */
-assert(H5E_LINKCOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_VERSION_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ALIGNMENT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADMESG_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDELETE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Resource errors */
-assert(H5E_NOSPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOPY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTFREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ALREADYEXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTLOCK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTUNLOCK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTGC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTGETSIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGETSIZE_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)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_READERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_WRITEERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CLOSEERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_OVERFLOW_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FCNTL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* B-tree related errors */
-assert(H5E_NOTFOUND_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_EXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
+/* Group related errors */
+assert(H5E_CANTOPENOBJ_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTENCODE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value"))==NULL)
+assert(H5E_CANTCLOSEOBJ_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDECODE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value"))==NULL)
+assert(H5E_COMPLEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSPLIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node"))==NULL)
+assert(H5E_CWG_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with current working group"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CWG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTINSERT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object"))==NULL)
+assert(H5E_LINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Link count failure"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node"))==NULL)
+assert(H5E_SLINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Symbolic link error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_SLINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* File accessability errors */
@@ -535,6 +432,38 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error"))==NULL)
 if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
+/* Object atom related errors */
+assert(H5E_BADATOM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADGROUP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTREGISTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTINC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTDEC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_NOIDS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
 /* Cache related errors */
 assert(H5E_CANTFLUSH_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache"))==NULL)
@@ -587,53 +516,124 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata"))==NULL)
 if((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Group related errors */
-assert(H5E_CANTOPENOBJ_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object"))==NULL)
+/* Parallel MPI errors */
+assert(H5E_MPI_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCLOSEOBJ_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object"))==NULL)
+assert(H5E_MPIERRSTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_COMPLEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long"))==NULL)
+
+/* Dataspace errors */
+assert(H5E_CANTCLIP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CWG_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with current working group"))==NULL)
+assert(H5E_CANTCOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CWG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_LINK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Link count failure"))==NULL)
+assert(H5E_CANTSELECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SLINK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Symbolic link error"))==NULL)
+assert(H5E_CANTNEXT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SLINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADSELECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCOMPARE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Function entry/exit interface errors */
-assert(H5E_CANTINIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object"))==NULL)
+/* B-tree related errors */
+assert(H5E_NOTFOUND_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ALREADYINIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized"))==NULL)
+assert(H5E_EXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTRELEASE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object"))==NULL)
+assert(H5E_CANTENCODE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTDECODE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTSPLIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTINSERT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Argument errors */
+assert(H5E_UNINITIALIZED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_UNSUPPORTED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADTYPE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADRANGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADVALUE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Datatype conversion errors */
+assert(H5E_CANTCONVERT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADSIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 #endif /* H5Einit_H */
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index a0938ae..e59e53b 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -23,65 +23,105 @@
 /* Major error codes */
 /*********************/
 
-#define H5E_BTREE           (H5OPEN H5E_BTREE_g)
-#define H5E_EFL             (H5OPEN H5E_EFL_g)
-#define H5E_REFERENCE       (H5OPEN H5E_REFERENCE_g)
-#define H5E_FPHDF5          (H5OPEN H5E_FPHDF5_g)
-#define H5E_INTERNAL        (H5OPEN H5E_INTERNAL_g)
-#define H5E_ERROR           (H5OPEN H5E_ERROR_g)
 #define H5E_DATASET         (H5OPEN H5E_DATASET_g)
-#define H5E_ATOM            (H5OPEN H5E_ATOM_g)
-#define H5E_TBBT            (H5OPEN H5E_TBBT_g)
-#define H5E_OHDR            (H5OPEN H5E_OHDR_g)
+#define H5E_FUNC            (H5OPEN H5E_FUNC_g)
 #define H5E_STORAGE         (H5OPEN H5E_STORAGE_g)
 #define H5E_FILE            (H5OPEN H5E_FILE_g)
-#define H5E_RS              (H5OPEN H5E_RS_g)
-#define H5E_DATATYPE        (H5OPEN H5E_DATATYPE_g)
-#define H5E_TST             (H5OPEN H5E_TST_g)
-#define H5E_RESOURCE        (H5OPEN H5E_RESOURCE_g)
-#define H5E_CACHE           (H5OPEN H5E_CACHE_g)
+#define H5E_FPHDF5          (H5OPEN H5E_FPHDF5_g)
 #define H5E_SYM             (H5OPEN H5E_SYM_g)
-#define H5E_FUNC            (H5OPEN H5E_FUNC_g)
 #define H5E_VFL             (H5OPEN H5E_VFL_g)
+#define H5E_INTERNAL        (H5OPEN H5E_INTERNAL_g)
+#define H5E_BTREE           (H5OPEN H5E_BTREE_g)
+#define H5E_REFERENCE       (H5OPEN H5E_REFERENCE_g)
+#define H5E_DATASPACE       (H5OPEN H5E_DATASPACE_g)
+#define H5E_RESOURCE        (H5OPEN H5E_RESOURCE_g)
 #define H5E_PLIST           (H5OPEN H5E_PLIST_g)
+#define H5E_DATATYPE        (H5OPEN H5E_DATATYPE_g)
+#define H5E_RS              (H5OPEN H5E_RS_g)
+#define H5E_HEAP            (H5OPEN H5E_HEAP_g)
+#define H5E_OHDR            (H5OPEN H5E_OHDR_g)
+#define H5E_TBBT            (H5OPEN H5E_TBBT_g)
+#define H5E_ATOM            (H5OPEN H5E_ATOM_g)
 #define H5E_ATTR            (H5OPEN H5E_ATTR_g)
 #define H5E_IO              (H5OPEN H5E_IO_g)
+#define H5E_EFL             (H5OPEN H5E_EFL_g)
+#define H5E_TST             (H5OPEN H5E_TST_g)
 #define H5E_ARGS            (H5OPEN H5E_ARGS_g)
-#define H5E_DATASPACE       (H5OPEN H5E_DATASPACE_g)
+#define H5E_ERROR           (H5OPEN H5E_ERROR_g)
 #define H5E_PLINE           (H5OPEN H5E_PLINE_g)
-#define H5E_HEAP            (H5OPEN H5E_HEAP_g)
-H5_DLLVAR hid_t H5E_BTREE_g;        /* B-Tree node */
-H5_DLLVAR hid_t H5E_EFL_g;          /* External file list */
-H5_DLLVAR hid_t H5E_REFERENCE_g;    /* References */
-H5_DLLVAR hid_t H5E_FPHDF5_g;       /* Flexible Parallel HDF5 */
-H5_DLLVAR hid_t H5E_INTERNAL_g;     /* Internal error (too specific to document in detail) */
-H5_DLLVAR hid_t H5E_ERROR_g;        /* Error API */
+#define H5E_CACHE           (H5OPEN H5E_CACHE_g)
 H5_DLLVAR hid_t H5E_DATASET_g;      /* Dataset */
-H5_DLLVAR hid_t H5E_ATOM_g;         /* Object atom */
-H5_DLLVAR hid_t H5E_TBBT_g;         /* Threaded, Balanced, Binary Trees */
-H5_DLLVAR hid_t H5E_OHDR_g;         /* Object header */
+H5_DLLVAR hid_t H5E_FUNC_g;         /* Function entry/exit */
 H5_DLLVAR hid_t H5E_STORAGE_g;      /* Data storage */
 H5_DLLVAR hid_t H5E_FILE_g;         /* File accessability */
-H5_DLLVAR hid_t H5E_RS_g;           /* Reference Counted Strings */
-H5_DLLVAR hid_t H5E_DATATYPE_g;     /* Datatype */
-H5_DLLVAR hid_t H5E_TST_g;          /* Ternary Search Trees */
-H5_DLLVAR hid_t H5E_RESOURCE_g;     /* Resource unavailable */
-H5_DLLVAR hid_t H5E_CACHE_g;        /* Object cache */
+H5_DLLVAR hid_t H5E_FPHDF5_g;       /* Flexible Parallel HDF5 */
 H5_DLLVAR hid_t H5E_SYM_g;          /* Symbol table */
-H5_DLLVAR hid_t H5E_FUNC_g;         /* Function entry/exit */
 H5_DLLVAR hid_t H5E_VFL_g;          /* Virtual File Layer */
+H5_DLLVAR hid_t H5E_INTERNAL_g;     /* Internal error (too specific to document in detail) */
+H5_DLLVAR hid_t H5E_BTREE_g;        /* B-Tree node */
+H5_DLLVAR hid_t H5E_REFERENCE_g;    /* References */
+H5_DLLVAR hid_t H5E_DATASPACE_g;    /* Dataspace */
+H5_DLLVAR hid_t H5E_RESOURCE_g;     /* Resource unavailable */
 H5_DLLVAR hid_t H5E_PLIST_g;        /* Property lists */
+H5_DLLVAR hid_t H5E_DATATYPE_g;     /* Datatype */
+H5_DLLVAR hid_t H5E_RS_g;           /* Reference Counted Strings */
+H5_DLLVAR hid_t H5E_HEAP_g;         /* Heap */
+H5_DLLVAR hid_t H5E_OHDR_g;         /* Object header */
+H5_DLLVAR hid_t H5E_TBBT_g;         /* Threaded, Balanced, Binary Trees */
+H5_DLLVAR hid_t H5E_ATOM_g;         /* Object atom */
 H5_DLLVAR hid_t H5E_ATTR_g;         /* Attribute */
 H5_DLLVAR hid_t H5E_IO_g;           /* Low-level I/O */
+H5_DLLVAR hid_t H5E_EFL_g;          /* External file list */
+H5_DLLVAR hid_t H5E_TST_g;          /* Ternary Search Trees */
 H5_DLLVAR hid_t H5E_ARGS_g;         /* Invalid arguments to routine */
-H5_DLLVAR hid_t H5E_DATASPACE_g;    /* Dataspace */
+H5_DLLVAR hid_t H5E_ERROR_g;        /* Error API */
 H5_DLLVAR hid_t H5E_PLINE_g;        /* Data filters */
-H5_DLLVAR hid_t H5E_HEAP_g;         /* Heap */
+H5_DLLVAR hid_t H5E_CACHE_g;        /* Object cache */
 
 /*********************/
 /* Minor error codes */
 /*********************/
 
+/* Generic low-level file I/O errors */
+#define H5E_SEEKERROR       (H5OPEN H5E_SEEKERROR_g)
+#define H5E_READERROR       (H5OPEN H5E_READERROR_g)
+#define H5E_WRITEERROR      (H5OPEN H5E_WRITEERROR_g)
+#define H5E_CLOSEERROR      (H5OPEN H5E_CLOSEERROR_g)
+#define H5E_OVERFLOW        (H5OPEN H5E_OVERFLOW_g)
+#define H5E_FCNTL           (H5OPEN H5E_FCNTL_g)
+H5_DLLVAR hid_t H5E_SEEKERROR_g;    /* Seek failed */
+H5_DLLVAR hid_t H5E_READERROR_g;    /* Read failed */
+H5_DLLVAR hid_t H5E_WRITEERROR_g;   /* Write failed */
+H5_DLLVAR hid_t H5E_CLOSEERROR_g;   /* Close failed */
+H5_DLLVAR hid_t H5E_OVERFLOW_g;     /* Address overflowed */
+H5_DLLVAR hid_t H5E_FCNTL_g;        /* File control (fcntl) failed */
+
+/* Resource errors */
+#define H5E_NOSPACE         (H5OPEN H5E_NOSPACE_g)
+#define H5E_CANTCOPY        (H5OPEN H5E_CANTCOPY_g)
+#define H5E_CANTFREE        (H5OPEN H5E_CANTFREE_g)
+#define H5E_ALREADYEXISTS   (H5OPEN H5E_ALREADYEXISTS_g)
+#define H5E_CANTLOCK        (H5OPEN H5E_CANTLOCK_g)
+#define H5E_CANTUNLOCK      (H5OPEN H5E_CANTUNLOCK_g)
+#define H5E_CANTGC          (H5OPEN H5E_CANTGC_g)
+#define H5E_CANTGETSIZE     (H5OPEN H5E_CANTGETSIZE_g)
+H5_DLLVAR hid_t H5E_NOSPACE_g;      /* No space available for allocation */
+H5_DLLVAR hid_t H5E_CANTCOPY_g;     /* Unable to copy object */
+H5_DLLVAR hid_t H5E_CANTFREE_g;     /* Unable to free object */
+H5_DLLVAR hid_t H5E_ALREADYEXISTS_g;/* Object already exists */
+H5_DLLVAR hid_t H5E_CANTLOCK_g;     /* Unable to lock object */
+H5_DLLVAR hid_t H5E_CANTUNLOCK_g;   /* Unable to unlock object */
+H5_DLLVAR hid_t H5E_CANTGC_g;       /* Unable to garbage collect */
+H5_DLLVAR hid_t H5E_CANTGETSIZE_g;  /* Unable to compute size */
+
+/* Function entry/exit interface errors */
+#define H5E_CANTINIT        (H5OPEN H5E_CANTINIT_g)
+#define H5E_ALREADYINIT     (H5OPEN H5E_ALREADYINIT_g)
+#define H5E_CANTRELEASE     (H5OPEN H5E_CANTRELEASE_g)
+H5_DLLVAR hid_t H5E_CANTINIT_g;     /* Unable to initialize object */
+H5_DLLVAR hid_t H5E_ALREADYINIT_g;  /* Object already initialized */
+H5_DLLVAR hid_t H5E_CANTRELEASE_g;  /* Unable to release object */
+
 /* Property list errors */
 #define H5E_CANTGET         (H5OPEN H5E_CANTGET_g)
 #define H5E_CANTSET         (H5OPEN H5E_CANTSET_g)
@@ -90,45 +130,17 @@ H5_DLLVAR hid_t H5E_CANTGET_g;      /* Can't get value */
 H5_DLLVAR hid_t H5E_CANTSET_g;      /* Can't set value */
 H5_DLLVAR hid_t H5E_DUPCLASS_g;     /* Duplicate class name in parent class */
 
-/* Dataspace errors */
-#define H5E_CANTCLIP        (H5OPEN H5E_CANTCLIP_g)
-#define H5E_CANTCOUNT       (H5OPEN H5E_CANTCOUNT_g)
-#define H5E_CANTSELECT      (H5OPEN H5E_CANTSELECT_g)
-#define H5E_CANTNEXT        (H5OPEN H5E_CANTNEXT_g)
-#define H5E_BADSELECT       (H5OPEN H5E_BADSELECT_g)
-#define H5E_CANTCOMPARE     (H5OPEN H5E_CANTCOMPARE_g)
-H5_DLLVAR hid_t H5E_CANTCLIP_g;     /* Can't clip hyperslab region */
-H5_DLLVAR hid_t H5E_CANTCOUNT_g;    /* Can't count elements */
-H5_DLLVAR hid_t H5E_CANTSELECT_g;   /* Can't select hyperslab */
-H5_DLLVAR hid_t H5E_CANTNEXT_g;     /* Can't move to next iterator location */
-H5_DLLVAR hid_t H5E_BADSELECT_g;    /* Invalid selection */
-H5_DLLVAR hid_t H5E_CANTCOMPARE_g;  /* Can't compare objects */
-
-/* Object atom related errors */
-#define H5E_BADATOM         (H5OPEN H5E_BADATOM_g)
-#define H5E_BADGROUP        (H5OPEN H5E_BADGROUP_g)
-#define H5E_CANTREGISTER    (H5OPEN H5E_CANTREGISTER_g)
-#define H5E_CANTINC         (H5OPEN H5E_CANTINC_g)
-#define H5E_CANTDEC         (H5OPEN H5E_CANTDEC_g)
-#define H5E_NOIDS           (H5OPEN H5E_NOIDS_g)
-H5_DLLVAR hid_t H5E_BADATOM_g;      /* Unable to find atom information (already closed?) */
-H5_DLLVAR hid_t H5E_BADGROUP_g;     /* Unable to find ID group information */
-H5_DLLVAR hid_t H5E_CANTREGISTER_g; /* Unable to register new atom */
-H5_DLLVAR hid_t H5E_CANTINC_g;      /* Unable to increment reference count */
-H5_DLLVAR hid_t H5E_CANTDEC_g;      /* Unable to decrement reference count */
-H5_DLLVAR hid_t H5E_NOIDS_g;        /* Out of IDs for group */
-
-/* Argument errors */
-#define H5E_UNINITIALIZED   (H5OPEN H5E_UNINITIALIZED_g)
-#define H5E_UNSUPPORTED     (H5OPEN H5E_UNSUPPORTED_g)
-#define H5E_BADTYPE         (H5OPEN H5E_BADTYPE_g)
-#define H5E_BADRANGE        (H5OPEN H5E_BADRANGE_g)
-#define H5E_BADVALUE        (H5OPEN H5E_BADVALUE_g)
-H5_DLLVAR hid_t H5E_UNINITIALIZED_g;/* Information is uinitialized */
-H5_DLLVAR hid_t H5E_UNSUPPORTED_g;  /* Feature is unsupported */
-H5_DLLVAR hid_t H5E_BADTYPE_g;      /* Inappropriate type */
-H5_DLLVAR hid_t H5E_BADRANGE_g;     /* Out of range */
-H5_DLLVAR hid_t H5E_BADVALUE_g;     /* Bad value */
+/* Object header related errors */
+#define H5E_LINKCOUNT       (H5OPEN H5E_LINKCOUNT_g)
+#define H5E_VERSION         (H5OPEN H5E_VERSION_g)
+#define H5E_ALIGNMENT       (H5OPEN H5E_ALIGNMENT_g)
+#define H5E_BADMESG         (H5OPEN H5E_BADMESG_g)
+#define H5E_CANTDELETE      (H5OPEN H5E_CANTDELETE_g)
+H5_DLLVAR hid_t H5E_LINKCOUNT_g;    /* Bad object header link count */
+H5_DLLVAR hid_t H5E_VERSION_g;      /* Wrong version number */
+H5_DLLVAR hid_t H5E_ALIGNMENT_g;    /* Alignment error */
+H5_DLLVAR hid_t H5E_BADMESG_g;      /* Unrecognized message */
+H5_DLLVAR hid_t H5E_CANTDELETE_g;   /* Can't delete message */
 
 /* FPHDF5 errors */
 #define H5E_CANTMAKETREE    (H5OPEN H5E_CANTMAKETREE_g)
@@ -154,77 +166,19 @@ H5_DLLVAR hid_t H5E_CANAPPLY_g;     /* Error from filter 'can apply' callback */
 H5_DLLVAR hid_t H5E_SETLOCAL_g;     /* Error from filter 'set local' callback */
 H5_DLLVAR hid_t H5E_NOENCODER_g;    /* Filter present but encoding disabled */
 
-/* Datatype conversion errors */
-#define H5E_CANTCONVERT     (H5OPEN H5E_CANTCONVERT_g)
-#define H5E_BADSIZE         (H5OPEN H5E_BADSIZE_g)
-H5_DLLVAR hid_t H5E_CANTCONVERT_g;  /* Can't convert datatypes */
-H5_DLLVAR hid_t H5E_BADSIZE_g;      /* Bad size for object */
-
-/* Parallel MPI errors */
-#define H5E_MPI             (H5OPEN H5E_MPI_g)
-#define H5E_MPIERRSTR       (H5OPEN H5E_MPIERRSTR_g)
-H5_DLLVAR hid_t H5E_MPI_g;          /* Some MPI function failed */
-H5_DLLVAR hid_t H5E_MPIERRSTR_g;    /* MPI Error String */
-
-/* Object header related errors */
-#define H5E_LINKCOUNT       (H5OPEN H5E_LINKCOUNT_g)
-#define H5E_VERSION         (H5OPEN H5E_VERSION_g)
-#define H5E_ALIGNMENT       (H5OPEN H5E_ALIGNMENT_g)
-#define H5E_BADMESG         (H5OPEN H5E_BADMESG_g)
-#define H5E_CANTDELETE      (H5OPEN H5E_CANTDELETE_g)
-H5_DLLVAR hid_t H5E_LINKCOUNT_g;    /* Bad object header link count */
-H5_DLLVAR hid_t H5E_VERSION_g;      /* Wrong version number */
-H5_DLLVAR hid_t H5E_ALIGNMENT_g;    /* Alignment error */
-H5_DLLVAR hid_t H5E_BADMESG_g;      /* Unrecognized message */
-H5_DLLVAR hid_t H5E_CANTDELETE_g;   /* Can't delete message */
-
-/* Resource errors */
-#define H5E_NOSPACE         (H5OPEN H5E_NOSPACE_g)
-#define H5E_CANTCOPY        (H5OPEN H5E_CANTCOPY_g)
-#define H5E_CANTFREE        (H5OPEN H5E_CANTFREE_g)
-#define H5E_ALREADYEXISTS   (H5OPEN H5E_ALREADYEXISTS_g)
-#define H5E_CANTLOCK        (H5OPEN H5E_CANTLOCK_g)
-#define H5E_CANTUNLOCK      (H5OPEN H5E_CANTUNLOCK_g)
-#define H5E_CANTGC          (H5OPEN H5E_CANTGC_g)
-#define H5E_CANTGETSIZE     (H5OPEN H5E_CANTGETSIZE_g)
-H5_DLLVAR hid_t H5E_NOSPACE_g;      /* No space available for allocation */
-H5_DLLVAR hid_t H5E_CANTCOPY_g;     /* Unable to copy object */
-H5_DLLVAR hid_t H5E_CANTFREE_g;     /* Unable to free object */
-H5_DLLVAR hid_t H5E_ALREADYEXISTS_g;/* Object already exists */
-H5_DLLVAR hid_t H5E_CANTLOCK_g;     /* Unable to lock object */
-H5_DLLVAR hid_t H5E_CANTUNLOCK_g;   /* Unable to unlock object */
-H5_DLLVAR hid_t H5E_CANTGC_g;       /* Unable to garbage collect */
-H5_DLLVAR hid_t H5E_CANTGETSIZE_g;  /* Unable to compute size */
-
-/* Generic low-level file I/O errors */
-#define H5E_SEEKERROR       (H5OPEN H5E_SEEKERROR_g)
-#define H5E_READERROR       (H5OPEN H5E_READERROR_g)
-#define H5E_WRITEERROR      (H5OPEN H5E_WRITEERROR_g)
-#define H5E_CLOSEERROR      (H5OPEN H5E_CLOSEERROR_g)
-#define H5E_OVERFLOW        (H5OPEN H5E_OVERFLOW_g)
-#define H5E_FCNTL           (H5OPEN H5E_FCNTL_g)
-H5_DLLVAR hid_t H5E_SEEKERROR_g;    /* Seek failed */
-H5_DLLVAR hid_t H5E_READERROR_g;    /* Read failed */
-H5_DLLVAR hid_t H5E_WRITEERROR_g;   /* Write failed */
-H5_DLLVAR hid_t H5E_CLOSEERROR_g;   /* Close failed */
-H5_DLLVAR hid_t H5E_OVERFLOW_g;     /* Address overflowed */
-H5_DLLVAR hid_t H5E_FCNTL_g;        /* File control (fcntl) failed */
-
-/* B-tree related errors */
-#define H5E_NOTFOUND        (H5OPEN H5E_NOTFOUND_g)
-#define H5E_EXISTS          (H5OPEN H5E_EXISTS_g)
-#define H5E_CANTENCODE      (H5OPEN H5E_CANTENCODE_g)
-#define H5E_CANTDECODE      (H5OPEN H5E_CANTDECODE_g)
-#define H5E_CANTSPLIT       (H5OPEN H5E_CANTSPLIT_g)
-#define H5E_CANTINSERT      (H5OPEN H5E_CANTINSERT_g)
-#define H5E_CANTLIST        (H5OPEN H5E_CANTLIST_g)
-H5_DLLVAR hid_t H5E_NOTFOUND_g;     /* Object not found */
-H5_DLLVAR hid_t H5E_EXISTS_g;       /* Object already exists */
-H5_DLLVAR hid_t H5E_CANTENCODE_g;   /* Unable to encode value */
-H5_DLLVAR hid_t H5E_CANTDECODE_g;   /* Unable to decode value */
-H5_DLLVAR hid_t H5E_CANTSPLIT_g;    /* Unable to split node */
-H5_DLLVAR hid_t H5E_CANTINSERT_g;   /* Unable to insert object */
-H5_DLLVAR hid_t H5E_CANTLIST_g;     /* Unable to list node */
+/* Group related errors */
+#define H5E_CANTOPENOBJ     (H5OPEN H5E_CANTOPENOBJ_g)
+#define H5E_CANTCLOSEOBJ    (H5OPEN H5E_CANTCLOSEOBJ_g)
+#define H5E_COMPLEN         (H5OPEN H5E_COMPLEN_g)
+#define H5E_CWG             (H5OPEN H5E_CWG_g)
+#define H5E_LINK            (H5OPEN H5E_LINK_g)
+#define H5E_SLINK           (H5OPEN H5E_SLINK_g)
+H5_DLLVAR hid_t H5E_CANTOPENOBJ_g;  /* Can't open object */
+H5_DLLVAR hid_t H5E_CANTCLOSEOBJ_g; /* Can't close object */
+H5_DLLVAR hid_t H5E_COMPLEN_g;      /* Name component is too long */
+H5_DLLVAR hid_t H5E_CWG_g;          /* Problem with current working group */
+H5_DLLVAR hid_t H5E_LINK_g;         /* Link count failure */
+H5_DLLVAR hid_t H5E_SLINK_g;        /* Symbolic link error */
 
 /* File accessability errors */
 #define H5E_FILEEXISTS      (H5OPEN H5E_FILEEXISTS_g)
@@ -246,6 +200,20 @@ H5_DLLVAR hid_t H5E_BADFILE_g;      /* Bad file ID accessed */
 H5_DLLVAR hid_t H5E_TRUNCATED_g;    /* File has been truncated */
 H5_DLLVAR hid_t H5E_MOUNT_g;        /* File mount error */
 
+/* Object atom related errors */
+#define H5E_BADATOM         (H5OPEN H5E_BADATOM_g)
+#define H5E_BADGROUP        (H5OPEN H5E_BADGROUP_g)
+#define H5E_CANTREGISTER    (H5OPEN H5E_CANTREGISTER_g)
+#define H5E_CANTINC         (H5OPEN H5E_CANTINC_g)
+#define H5E_CANTDEC         (H5OPEN H5E_CANTDEC_g)
+#define H5E_NOIDS           (H5OPEN H5E_NOIDS_g)
+H5_DLLVAR hid_t H5E_BADATOM_g;      /* Unable to find atom information (already closed?) */
+H5_DLLVAR hid_t H5E_BADGROUP_g;     /* Unable to find ID group information */
+H5_DLLVAR hid_t H5E_CANTREGISTER_g; /* Unable to register new atom */
+H5_DLLVAR hid_t H5E_CANTINC_g;      /* Unable to increment reference count */
+H5_DLLVAR hid_t H5E_CANTDEC_g;      /* Unable to decrement reference count */
+H5_DLLVAR hid_t H5E_NOIDS_g;        /* Out of IDs for group */
+
 /* Cache related errors */
 #define H5E_CANTFLUSH       (H5OPEN H5E_CANTFLUSH_g)
 #define H5E_CANTSERIALIZE   (H5OPEN H5E_CANTSERIALIZE_g)
@@ -268,26 +236,58 @@ H5_DLLVAR hid_t H5E_CANTRENAME_g;   /* Unable to rename metadata */
 H5_DLLVAR hid_t H5E_CANTPROTECT_g;  /* Unable to protect metadata */
 H5_DLLVAR hid_t H5E_CANTUNPROTECT_g;/* Unable to unprotect metadata */
 
-/* Group related errors */
-#define H5E_CANTOPENOBJ     (H5OPEN H5E_CANTOPENOBJ_g)
-#define H5E_CANTCLOSEOBJ    (H5OPEN H5E_CANTCLOSEOBJ_g)
-#define H5E_COMPLEN         (H5OPEN H5E_COMPLEN_g)
-#define H5E_CWG             (H5OPEN H5E_CWG_g)
-#define H5E_LINK            (H5OPEN H5E_LINK_g)
-#define H5E_SLINK           (H5OPEN H5E_SLINK_g)
-H5_DLLVAR hid_t H5E_CANTOPENOBJ_g;  /* Can't open object */
-H5_DLLVAR hid_t H5E_CANTCLOSEOBJ_g; /* Can't close object */
-H5_DLLVAR hid_t H5E_COMPLEN_g;      /* Name component is too long */
-H5_DLLVAR hid_t H5E_CWG_g;          /* Problem with current working group */
-H5_DLLVAR hid_t H5E_LINK_g;         /* Link count failure */
-H5_DLLVAR hid_t H5E_SLINK_g;        /* Symbolic link error */
+/* Parallel MPI errors */
+#define H5E_MPI             (H5OPEN H5E_MPI_g)
+#define H5E_MPIERRSTR       (H5OPEN H5E_MPIERRSTR_g)
+H5_DLLVAR hid_t H5E_MPI_g;          /* Some MPI function failed */
+H5_DLLVAR hid_t H5E_MPIERRSTR_g;    /* MPI Error String */
 
-/* Function entry/exit interface errors */
-#define H5E_CANTINIT        (H5OPEN H5E_CANTINIT_g)
-#define H5E_ALREADYINIT     (H5OPEN H5E_ALREADYINIT_g)
-#define H5E_CANTRELEASE     (H5OPEN H5E_CANTRELEASE_g)
-H5_DLLVAR hid_t H5E_CANTINIT_g;     /* Unable to initialize object */
-H5_DLLVAR hid_t H5E_ALREADYINIT_g;  /* Object already initialized */
-H5_DLLVAR hid_t H5E_CANTRELEASE_g;  /* Unable to release object */
+/* Dataspace errors */
+#define H5E_CANTCLIP        (H5OPEN H5E_CANTCLIP_g)
+#define H5E_CANTCOUNT       (H5OPEN H5E_CANTCOUNT_g)
+#define H5E_CANTSELECT      (H5OPEN H5E_CANTSELECT_g)
+#define H5E_CANTNEXT        (H5OPEN H5E_CANTNEXT_g)
+#define H5E_BADSELECT       (H5OPEN H5E_BADSELECT_g)
+#define H5E_CANTCOMPARE     (H5OPEN H5E_CANTCOMPARE_g)
+H5_DLLVAR hid_t H5E_CANTCLIP_g;     /* Can't clip hyperslab region */
+H5_DLLVAR hid_t H5E_CANTCOUNT_g;    /* Can't count elements */
+H5_DLLVAR hid_t H5E_CANTSELECT_g;   /* Can't select hyperslab */
+H5_DLLVAR hid_t H5E_CANTNEXT_g;     /* Can't move to next iterator location */
+H5_DLLVAR hid_t H5E_BADSELECT_g;    /* Invalid selection */
+H5_DLLVAR hid_t H5E_CANTCOMPARE_g;  /* Can't compare objects */
+
+/* B-tree related errors */
+#define H5E_NOTFOUND        (H5OPEN H5E_NOTFOUND_g)
+#define H5E_EXISTS          (H5OPEN H5E_EXISTS_g)
+#define H5E_CANTENCODE      (H5OPEN H5E_CANTENCODE_g)
+#define H5E_CANTDECODE      (H5OPEN H5E_CANTDECODE_g)
+#define H5E_CANTSPLIT       (H5OPEN H5E_CANTSPLIT_g)
+#define H5E_CANTINSERT      (H5OPEN H5E_CANTINSERT_g)
+#define H5E_CANTLIST        (H5OPEN H5E_CANTLIST_g)
+H5_DLLVAR hid_t H5E_NOTFOUND_g;     /* Object not found */
+H5_DLLVAR hid_t H5E_EXISTS_g;       /* Object already exists */
+H5_DLLVAR hid_t H5E_CANTENCODE_g;   /* Unable to encode value */
+H5_DLLVAR hid_t H5E_CANTDECODE_g;   /* Unable to decode value */
+H5_DLLVAR hid_t H5E_CANTSPLIT_g;    /* Unable to split node */
+H5_DLLVAR hid_t H5E_CANTINSERT_g;   /* Unable to insert object */
+H5_DLLVAR hid_t H5E_CANTLIST_g;     /* Unable to list node */
+
+/* Argument errors */
+#define H5E_UNINITIALIZED   (H5OPEN H5E_UNINITIALIZED_g)
+#define H5E_UNSUPPORTED     (H5OPEN H5E_UNSUPPORTED_g)
+#define H5E_BADTYPE         (H5OPEN H5E_BADTYPE_g)
+#define H5E_BADRANGE        (H5OPEN H5E_BADRANGE_g)
+#define H5E_BADVALUE        (H5OPEN H5E_BADVALUE_g)
+H5_DLLVAR hid_t H5E_UNINITIALIZED_g;/* Information is uinitialized */
+H5_DLLVAR hid_t H5E_UNSUPPORTED_g;  /* Feature is unsupported */
+H5_DLLVAR hid_t H5E_BADTYPE_g;      /* Inappropriate type */
+H5_DLLVAR hid_t H5E_BADRANGE_g;     /* Out of range */
+H5_DLLVAR hid_t H5E_BADVALUE_g;     /* Bad value */
+
+/* Datatype conversion errors */
+#define H5E_CANTCONVERT     (H5OPEN H5E_CANTCONVERT_g)
+#define H5E_BADSIZE         (H5OPEN H5E_BADSIZE_g)
+H5_DLLVAR hid_t H5E_CANTCONVERT_g;  /* Can't convert datatypes */
+H5_DLLVAR hid_t H5E_BADSIZE_g;      /* Bad size for object */
 
 #endif /* H5Epubgen_H */
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index 6be8cb6..4f5bda9 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -21,64 +21,71 @@
 
 /* Reset major error IDs */
     
-H5E_BTREE_g=    
-H5E_EFL_g=    
-H5E_REFERENCE_g=    
-H5E_FPHDF5_g=    
-H5E_INTERNAL_g=    
-H5E_ERROR_g=    
 H5E_DATASET_g=    
-H5E_ATOM_g=    
-H5E_TBBT_g=    
-H5E_OHDR_g=    
+H5E_FUNC_g=    
 H5E_STORAGE_g=    
 H5E_FILE_g=    
-H5E_RS_g=    
-H5E_DATATYPE_g=    
-H5E_TST_g=    
-H5E_RESOURCE_g=    
-H5E_CACHE_g=    
+H5E_FPHDF5_g=    
 H5E_SYM_g=    
-H5E_FUNC_g=    
 H5E_VFL_g=    
+H5E_INTERNAL_g=    
+H5E_BTREE_g=    
+H5E_REFERENCE_g=    
+H5E_DATASPACE_g=    
+H5E_RESOURCE_g=    
 H5E_PLIST_g=    
+H5E_DATATYPE_g=    
+H5E_RS_g=    
+H5E_HEAP_g=    
+H5E_OHDR_g=    
+H5E_TBBT_g=    
+H5E_ATOM_g=    
 H5E_ATTR_g=    
 H5E_IO_g=    
+H5E_EFL_g=    
+H5E_TST_g=    
 H5E_ARGS_g=    
-H5E_DATASPACE_g=    
+H5E_ERROR_g=    
 H5E_PLINE_g=    
-H5E_HEAP_g= (-1);
+H5E_CACHE_g= (-1);
 
 /* Reset minor error IDs */
 
 
+/* Generic low-level file I/O errors */    
+H5E_SEEKERROR_g=    
+H5E_READERROR_g=    
+H5E_WRITEERROR_g=    
+H5E_CLOSEERROR_g=    
+H5E_OVERFLOW_g=    
+H5E_FCNTL_g=
+
+/* Resource errors */    
+H5E_NOSPACE_g=    
+H5E_CANTCOPY_g=    
+H5E_CANTFREE_g=    
+H5E_ALREADYEXISTS_g=    
+H5E_CANTLOCK_g=    
+H5E_CANTUNLOCK_g=    
+H5E_CANTGC_g=    
+H5E_CANTGETSIZE_g=
+
+/* Function entry/exit interface errors */    
+H5E_CANTINIT_g=    
+H5E_ALREADYINIT_g=    
+H5E_CANTRELEASE_g=
+
 /* Property list errors */    
 H5E_CANTGET_g=    
 H5E_CANTSET_g=    
 H5E_DUPCLASS_g=
 
-/* Dataspace errors */    
-H5E_CANTCLIP_g=    
-H5E_CANTCOUNT_g=    
-H5E_CANTSELECT_g=    
-H5E_CANTNEXT_g=    
-H5E_BADSELECT_g=    
-H5E_CANTCOMPARE_g=
-
-/* Object atom related errors */    
-H5E_BADATOM_g=    
-H5E_BADGROUP_g=    
-H5E_CANTREGISTER_g=    
-H5E_CANTINC_g=    
-H5E_CANTDEC_g=    
-H5E_NOIDS_g=
-
-/* Argument errors */    
-H5E_UNINITIALIZED_g=    
-H5E_UNSUPPORTED_g=    
-H5E_BADTYPE_g=    
-H5E_BADRANGE_g=    
-H5E_BADVALUE_g=
+/* Object header related errors */    
+H5E_LINKCOUNT_g=    
+H5E_VERSION_g=    
+H5E_ALIGNMENT_g=    
+H5E_BADMESG_g=    
+H5E_CANTDELETE_g=
 
 /* FPHDF5 errors */    
 H5E_CANTMAKETREE_g=    
@@ -94,47 +101,13 @@ H5E_CANAPPLY_g=
 H5E_SETLOCAL_g=    
 H5E_NOENCODER_g=
 
-/* Datatype conversion errors */    
-H5E_CANTCONVERT_g=    
-H5E_BADSIZE_g=
-
-/* Parallel MPI errors */    
-H5E_MPI_g=    
-H5E_MPIERRSTR_g=
-
-/* Object header related errors */    
-H5E_LINKCOUNT_g=    
-H5E_VERSION_g=    
-H5E_ALIGNMENT_g=    
-H5E_BADMESG_g=    
-H5E_CANTDELETE_g=
-
-/* Resource errors */    
-H5E_NOSPACE_g=    
-H5E_CANTCOPY_g=    
-H5E_CANTFREE_g=    
-H5E_ALREADYEXISTS_g=    
-H5E_CANTLOCK_g=    
-H5E_CANTUNLOCK_g=    
-H5E_CANTGC_g=    
-H5E_CANTGETSIZE_g=
-
-/* Generic low-level file I/O errors */    
-H5E_SEEKERROR_g=    
-H5E_READERROR_g=    
-H5E_WRITEERROR_g=    
-H5E_CLOSEERROR_g=    
-H5E_OVERFLOW_g=    
-H5E_FCNTL_g=
-
-/* B-tree related errors */    
-H5E_NOTFOUND_g=    
-H5E_EXISTS_g=    
-H5E_CANTENCODE_g=    
-H5E_CANTDECODE_g=    
-H5E_CANTSPLIT_g=    
-H5E_CANTINSERT_g=    
-H5E_CANTLIST_g=
+/* Group related errors */    
+H5E_CANTOPENOBJ_g=    
+H5E_CANTCLOSEOBJ_g=    
+H5E_COMPLEN_g=    
+H5E_CWG_g=    
+H5E_LINK_g=    
+H5E_SLINK_g=
 
 /* File accessability errors */    
 H5E_FILEEXISTS_g=    
@@ -147,6 +120,14 @@ H5E_BADFILE_g=
 H5E_TRUNCATED_g=    
 H5E_MOUNT_g=
 
+/* Object atom related errors */    
+H5E_BADATOM_g=    
+H5E_BADGROUP_g=    
+H5E_CANTREGISTER_g=    
+H5E_CANTINC_g=    
+H5E_CANTDEC_g=    
+H5E_NOIDS_g=
+
 /* Cache related errors */    
 H5E_CANTFLUSH_g=    
 H5E_CANTSERIALIZE_g=    
@@ -159,17 +140,36 @@ H5E_CANTRENAME_g=
 H5E_CANTPROTECT_g=    
 H5E_CANTUNPROTECT_g=
 
-/* Group related errors */    
-H5E_CANTOPENOBJ_g=    
-H5E_CANTCLOSEOBJ_g=    
-H5E_COMPLEN_g=    
-H5E_CWG_g=    
-H5E_LINK_g=    
-H5E_SLINK_g=
+/* Parallel MPI errors */    
+H5E_MPI_g=    
+H5E_MPIERRSTR_g=
 
-/* Function entry/exit interface errors */    
-H5E_CANTINIT_g=    
-H5E_ALREADYINIT_g=    
-H5E_CANTRELEASE_g= (-1);
+/* Dataspace errors */    
+H5E_CANTCLIP_g=    
+H5E_CANTCOUNT_g=    
+H5E_CANTSELECT_g=    
+H5E_CANTNEXT_g=    
+H5E_BADSELECT_g=    
+H5E_CANTCOMPARE_g=
+
+/* B-tree related errors */    
+H5E_NOTFOUND_g=    
+H5E_EXISTS_g=    
+H5E_CANTENCODE_g=    
+H5E_CANTDECODE_g=    
+H5E_CANTSPLIT_g=    
+H5E_CANTINSERT_g=    
+H5E_CANTLIST_g=
+
+/* Argument errors */    
+H5E_UNINITIALIZED_g=    
+H5E_UNSUPPORTED_g=    
+H5E_BADTYPE_g=    
+H5E_BADRANGE_g=    
+H5E_BADVALUE_g=
+
+/* Datatype conversion errors */    
+H5E_CANTCONVERT_g=    
+H5E_BADSIZE_g= (-1);
 
 #endif /* H5Eterm_H */
diff --git a/src/H5F.c b/src/H5F.c
index 92b87c0..6aac8d1 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -4397,40 +4397,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_mpi_get_size
- *
- * Purpose:	Retrieves the size of the communicator used for the file
- *
- * Return:	Success:	The communicator size (non-negative)
- *
- *		Failure:	Negative
- *
- * Programmer:	Quincey Koziol
- *              Friday, January 30, 2004
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-int
-H5F_mpi_get_size(const H5F_t *f)
-{
-    int	ret_value;
-
-    FUNC_ENTER_NOAPI(H5F_mpi_get_size, FAIL)
-
-    assert(f && f->shared);
-    
-    /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_size(f->shared->lf))<0)
-        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_size request failed")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_mpi_get_size() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5F_mpi_get_comm
  *
  * Purpose:	Retrieves the file's communicator
diff --git a/src/H5FD.c b/src/H5FD.c
index af58337..2c5465b 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -49,13 +49,12 @@
 #include "H5FDstdio.h"		/* Standard C buffered I/O		*/
 #include "H5FDstream.h"     	/* In-memory files streamed via sockets */
 #include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"		/* Property lists			*/
-
 #ifdef H5_HAVE_FPHDF5
 #include "H5FPprivate.h"        /*Flexible Parallel HDF5                */
 #endif  /* H5_HAVE_FPHDF5 */
+#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Pprivate.h"		/* Property lists			*/
 
 /* static prototypes */
 static herr_t H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size,
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index eecd336..42eda85 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -382,8 +382,7 @@ done:
  */
 static H5FD_t *
 H5FD_core_open(const char *name, unsigned UNUSED flags, hid_t fapl_id,
-	       haddr_t 
-		   maxaddr)
+	       haddr_t maxaddr)
 {
     H5FD_core_t		*file=NULL;
     H5FD_core_fapl_t	*fa=NULL;
@@ -854,4 +853,3 @@ H5FD_core_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
-
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 5ecc3cb..aac7bf6 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -92,4 +92,3 @@ H5_DLL MPI_Comm H5FD_mpi_get_comm(const H5FD_t *_file);
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* H5FDmpi_H */
-
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 1156398..9d5c48a 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -204,6 +204,7 @@ H5FD_mpio_init(void)
 
     if (H5I_VFL!=H5I_get_type(H5FD_MPIO_g))
         H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g,sizeof(H5FD_class_mpi_t));
+
 #ifdef H5FDmpio_DEBUG
     if (!H5FD_mpio_Debug_inited)
     {
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index d27e4d1..77864e0 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -680,7 +680,7 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
 #else
     H5Eclear(H5E_DEFAULT);
 #endif /* H5_WANT_H5_V1_6_COMPAT */
-            
+
     *file_handle = &(file->fp);
     if(*file_handle==NULL)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "get handle failed", -1)
diff --git a/src/H5FDstream.c b/src/H5FDstream.c
index 1cf02db..5e02623 100644
--- a/src/H5FDstream.c
+++ b/src/H5FDstream.c
@@ -12,8 +12,6 @@
  *          In addition to that, the memory image of the file is
  *          read from/written to a socket during an open/flush operation.
  *
- * Version: $Id$
- *
  * Modifications:
  *          Thomas Radke, Thursday, October 26, 2000
  *          Added support for Windows.
diff --git a/src/H5FDstream.h b/src/H5FDstream.h
index 851da42..890eb5a 100644
--- a/src/H5FDstream.h
+++ b/src/H5FDstream.h
@@ -8,8 +8,6 @@
  *
  * Purpose:	The public header file for the Stream Virtual File Driver.
  *
- * Version: $Header$
- *
  * Modifications:
  *          Thomas Radke, Thursday, October 26, 2000
  *          Added support for Windows.
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 7b3c9e1..c02a86a 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -404,7 +404,6 @@ H5_DLL haddr_t H5F_get_base_addr(const H5F_t *f);
 H5_DLL haddr_t H5F_get_eoa(const H5F_t *f);
 #ifdef H5_HAVE_PARALLEL
 H5_DLL int H5F_mpi_get_rank(const H5F_t *f);
-H5_DLL int H5F_mpi_get_size(const H5F_t *f);
 H5_DLL MPI_Comm H5F_mpi_get_comm(const H5F_t *f);
 #endif /* H5_HAVE_PARALLEL */
 
diff --git a/src/H5S.c b/src/H5S.c
index c7816d8..70e8b55 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -40,6 +40,8 @@ static H5S_t * H5S_create(H5S_class_t type);
 static herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank,
     const hsize_t *dims, const hsize_t *max);
 static htri_t H5S_is_simple(const H5S_t *sdim);
+static herr_t H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc);
+static H5S_t *H5S_decode(const unsigned char *buf);
 
 #ifdef H5S_DEBUG
 /* Names of the selection names, for debugging */
@@ -1766,12 +1768,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Sencode(hid_t obj_id, unsigned char* buf, size_t* nalloc)
+H5Sencode(hid_t obj_id, void *buf, size_t *nalloc)
 {
     H5S_t       *dspace;
     herr_t      ret_value=SUCCEED;
     
     FUNC_ENTER_API (H5Sencode, FAIL);
+    H5TRACE3("e","ix*z",obj_id,buf,nalloc);
 
     /* Check argument and retrieve object */
     if (NULL==(dspace=H5I_object_verify(obj_id, H5I_DATASPACE)))
@@ -1884,12 +1887,13 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Sdecode(unsigned char* buf)
+H5Sdecode(const void *buf)
 {
     H5S_t       *ds;
     hid_t       ret_value;
     
     FUNC_ENTER_API (H5Sdecode, FAIL);
+    H5TRACE1("i","x",buf);
 
     if (buf==NULL)
 	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer")
@@ -1925,7 +1929,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5S_t*
-H5S_decode(unsigned char *buf)
+H5S_decode(const unsigned char *buf)
 {
     H5S_t       *ds;
     H5S_extent_t        *extent;
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index be8108e..732a4d2 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -206,8 +206,6 @@ typedef struct H5S_conv_t {
 /* Operations on dataspaces */
 H5_DLL H5S_t *H5S_copy(const H5S_t *src, hbool_t share_selection);
 H5_DLL herr_t H5S_close(H5S_t *ds);
-H5_DLL herr_t H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc);
-H5_DLL H5S_t *H5S_decode(unsigned char *buf);
 H5_DLL H5S_conv_t *H5S_find(const H5F_t *file,const H5S_t *mem_space, const H5S_t *file_space,
                 unsigned flags, hbool_t *use_par_opt_io,const H5O_layout_t *layout );
 H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds);
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index 2017727..84ed534 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -100,8 +100,8 @@ H5_DLL herr_t H5Sset_extent_simple(hid_t space_id, int rank,
 				    const hsize_t max[]);
 H5_DLL hid_t H5Scopy(hid_t space_id);
 H5_DLL herr_t H5Sclose(hid_t space_id);
-H5_DLL herr_t H5Sencode(hid_t obj_id, unsigned char* buf, size_t* nalloc);
-H5_DLL hid_t H5Sdecode(unsigned char* buf);
+H5_DLL herr_t H5Sencode(hid_t obj_id, void *buf, size_t *nalloc);
+H5_DLL hid_t H5Sdecode(const void *buf);
 H5_DLL hssize_t H5Sget_simple_extent_npoints(hid_t space_id);
 H5_DLL int H5Sget_simple_extent_ndims(hid_t space_id);
 H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[],
diff --git a/src/H5T.c b/src/H5T.c
index 8863ceb..afd4b14 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -258,6 +258,8 @@ static herr_t H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src,
                 H5T_t *dst, H5T_conv_t func, hid_t dxpl_id);
 static herr_t H5T_register(H5T_pers_t pers, const char *name, H5T_t *src,
         H5T_t *dst, H5T_conv_t func, hid_t dxpl_id);
+static herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc);
+static H5T_t *H5T_decode(const unsigned char *buf);
 
 /* Local macro definitions */
 #define H5T_ENCODE_VERSION      0
@@ -2575,7 +2577,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tencode(hid_t obj_id, unsigned char* buf, size_t* nalloc)
+H5Tencode(hid_t obj_id, void *buf, size_t* nalloc)
 {
     H5T_t       *dtype;
     herr_t      ret_value=SUCCEED;
@@ -2615,12 +2617,13 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Tdecode(unsigned char* buf)
+H5Tdecode(const void *buf)
 {
     H5T_t       *dt;
     hid_t       ret_value;
     
     FUNC_ENTER_API (H5Tdecode, FAIL);
+    H5TRACE1("i","x",buf);
 
     if (buf==NULL)
 	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer")
@@ -2660,7 +2663,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-herr_t
+static herr_t
 H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc)
 {
     size_t      buf_size;
@@ -2711,8 +2714,8 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5T_t*
-H5T_decode(unsigned char *buf)
+static H5T_t *
+H5T_decode(const unsigned char *buf)
 {
     H5T_t       *ret_value;
 
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index a8840e7..965ca93 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -93,8 +93,6 @@ H5_DLL htri_t H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc);
 H5_DLL htri_t H5T_is_sensible(const H5T_t *dt);
 H5_DLL htri_t H5T_committed(H5T_t *type);
 H5_DLL int H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id);
-H5_DLL herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc);
-H5_DLL H5T_t *H5T_decode(unsigned char *buf);
 
 /* Reference specific functions */
 H5_DLL H5R_type_t H5T_get_ref_type(const H5T_t *dt);
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 7e5f8eb..c4daeb1 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -485,8 +485,8 @@ H5_DLL htri_t H5Tequal(hid_t type1_id, hid_t type2_id);
 H5_DLL herr_t H5Tlock(hid_t type_id);
 H5_DLL herr_t H5Tcommit(hid_t loc_id, const char *name, hid_t type_id);
 H5_DLL htri_t H5Tcommitted(hid_t type_id);
-H5_DLL herr_t H5Tencode(hid_t obj_id, unsigned char* buf, size_t* nalloc);
-H5_DLL hid_t H5Tdecode(unsigned char* buf);
+H5_DLL herr_t H5Tencode(hid_t obj_id, void *buf, size_t *nalloc);
+H5_DLL hid_t H5Tdecode(const void *buf);
 
 /* Operations defined on compound datatypes */
 H5_DLL herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset,