Update autotools files

author: Allen Byrne <byrn@hdfgroup.org> 2020-10-14 12:45:01 (GMT)
committer: Allen Byrne <byrn@hdfgroup.org> 2020-10-15 13:09:49 (GMT)
commit: ce13b5f0472500e54afca638d6c6ef8e7090466e (patch)
tree: c5f66cb63f808f8ed6da3feb7c5b24d29ce0de85 /src
parent: 48d171b04730aff7beade684e9afd164f0204b0c (diff)
download: hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.zip
hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.tar.gz
hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.tar.bz2
29 files changed, 3736 insertions, 3396 deletions
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index e3f65d3..0e4a570 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -14,200 +14,201 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
+
 #ifndef _H5Edefin_H
 #define _H5Edefin_H
 
 /* Major error IDs */
-hid_t H5E_DATASET_g    = FAIL; /* Dataset */
-hid_t H5E_FUNC_g       = FAIL; /* Function entry/exit */
-hid_t H5E_STORAGE_g    = FAIL; /* Data storage */
-hid_t H5E_FILE_g       = FAIL; /* File accessibilty */
-hid_t H5E_SOHM_g       = FAIL; /* Shared Object Header Messages */
-hid_t H5E_SYM_g        = FAIL; /* Symbol table */
-hid_t H5E_PLUGIN_g     = FAIL; /* Plugin for dynamically loaded library */
-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_LINK_g       = FAIL; /* Links */
-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_ATOM_g       = FAIL; /* Object atom */
-hid_t H5E_ATTR_g       = FAIL; /* Attribute */
-hid_t H5E_NONE_MAJOR_g = FAIL; /* No error */
-hid_t H5E_IO_g         = FAIL; /* Low-level I/O */
-hid_t H5E_SLIST_g      = FAIL; /* Skip Lists */
-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_ERROR_g      = FAIL; /* Error API */
-hid_t H5E_PLINE_g      = FAIL; /* Data filters */
-hid_t H5E_FSPACE_g     = FAIL; /* Free Space Manager */
-hid_t H5E_CACHE_g      = FAIL; /* Object cache */
+hid_t H5E_ATTR_g           = FAIL;      /* Attribute */
+hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
+hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
+hid_t H5E_SLIST_g          = FAIL;      /* Skip Lists */
+hid_t H5E_OHDR_g           = FAIL;      /* Object header */
+hid_t H5E_EFL_g            = FAIL;      /* External file list */
+hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
+hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
+hid_t H5E_IO_g             = FAIL;      /* Low-level I/O */
+hid_t H5E_VFL_g            = FAIL;      /* Virtual File Layer */
+hid_t H5E_NONE_MAJOR_g     = FAIL;      /* No error */
+hid_t H5E_REFERENCE_g      = FAIL;      /* References */
+hid_t H5E_PLINE_g          = FAIL;      /* Data filters */
+hid_t H5E_DATASET_g        = FAIL;      /* Dataset */
+hid_t H5E_PLUGIN_g         = FAIL;      /* Plugin for dynamically loaded library */
+hid_t H5E_ARGS_g           = FAIL;      /* Invalid arguments to routine */
+hid_t H5E_LINK_g           = FAIL;      /* Links */
+hid_t H5E_SYM_g            = FAIL;      /* Symbol table */
+hid_t H5E_HEAP_g           = FAIL;      /* Heap */
+hid_t H5E_ERROR_g          = FAIL;      /* Error API */
+hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
+hid_t H5E_PLIST_g          = FAIL;      /* Property lists */
+hid_t H5E_SOHM_g           = FAIL;      /* Shared Object Header Messages */
+hid_t H5E_FILE_g           = FAIL;      /* File accessibilty */
+hid_t H5E_STORAGE_g        = FAIL;      /* Data storage */
+hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
+hid_t H5E_FSPACE_g         = FAIL;      /* Free Space Manager */
+hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
+hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
+hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
+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 */
+/* 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 */
 
-/* Resource errors */
-hid_t H5E_NOSPACE_g       = FAIL; /* No space available for allocation */
-hid_t H5E_CANTALLOC_g     = FAIL; /* Can't allocate space */
-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 */
-hid_t H5E_OBJOPEN_g       = FAIL; /* Object is already open */
+/* Datatype conversion errors */
+hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
+hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
 
 /* Heap errors */
-hid_t H5E_CANTRESTORE_g = FAIL; /* Can't restore condition */
-hid_t H5E_CANTCOMPUTE_g = FAIL; /* Can't compute value */
-hid_t H5E_CANTEXTEND_g  = FAIL; /* Can't extend heap's space */
-hid_t H5E_CANTATTACH_g  = FAIL; /* Can't attach object */
-hid_t H5E_CANTUPDATE_g  = FAIL; /* Can't update object */
-hid_t H5E_CANTOPERATE_g = FAIL; /* Can't operate on object */
-
-/* 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 */
-hid_t H5E_SETDISALLOWED_g = FAIL; /* Disallowed operation */
+hid_t H5E_CANTRESTORE_g    = FAIL;      /* Can't restore condition */
+hid_t H5E_CANTCOMPUTE_g    = FAIL;      /* Can't compute value */
+hid_t H5E_CANTEXTEND_g     = FAIL;      /* Can't extend heap's space */
+hid_t H5E_CANTATTACH_g     = FAIL;      /* Can't attach object */
+hid_t H5E_CANTUPDATE_g     = FAIL;      /* Can't update object */
+hid_t H5E_CANTOPERATE_g    = FAIL;      /* Can't operate on object */
 
 /* Free space errors */
-hid_t H5E_CANTMERGE_g  = FAIL; /* Can't merge objects */
-hid_t H5E_CANTREVIVE_g = FAIL; /* Can't revive object */
-hid_t H5E_CANTSHRINK_g = FAIL; /* Can't shrink container */
+hid_t H5E_CANTMERGE_g      = FAIL;      /* Can't merge objects */
+hid_t H5E_CANTREVIVE_g     = FAIL;      /* Can't revive object */
+hid_t H5E_CANTSHRINK_g     = FAIL;      /* Can't shrink container */
 
-/* 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 */
-hid_t H5E_BADITER_g    = FAIL; /* Iteration failed */
-hid_t H5E_CANTPACK_g   = FAIL; /* Can't pack messages */
-hid_t H5E_CANTRESET_g  = FAIL; /* Can't reset object */
-hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename object */
+/* Resource errors */
+hid_t H5E_NOSPACE_g        = FAIL;      /* No space available for allocation */
+hid_t H5E_CANTALLOC_g      = FAIL;      /* Can't allocate space */
+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 */
+hid_t H5E_OBJOPEN_g        = FAIL;      /* Object is already open */
+
+/* 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 */
 
 /* System level errors */
-hid_t H5E_SYSERRSTR_g = FAIL; /* System error message */
+hid_t H5E_SYSERRSTR_g      = FAIL;      /* System error message */
 
-/* I/O pipeline errors */
-hid_t H5E_NOFILTER_g   = FAIL; /* Requested filter is not available */
-hid_t H5E_CALLBACK_g   = FAIL; /* Callback failed */
-hid_t H5E_CANAPPLY_g   = FAIL; /* Error from filter 'can apply' callback */
-hid_t H5E_SETLOCAL_g   = FAIL; /* Error from filter 'set local' callback */
-hid_t H5E_NOENCODER_g  = FAIL; /* Filter present but encoding disabled */
-hid_t H5E_CANTFILTER_g = FAIL; /* Filter operation failed */
+/* Parallel MPI errors */
+hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
+hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
+hid_t H5E_CANTRECV_g       = FAIL;      /* Can't receive data */
 
-/* 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_PATH_g         = FAIL; /* Problem with path to 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 */
 
-/* No error */
-hid_t H5E_NONE_MINOR_g = FAIL; /* No error */
+/* 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 */
+hid_t H5E_CANTLOAD_g       = FAIL;      /* Unable to load metadata into cache */
+hid_t H5E_PROTECT_g        = FAIL;      /* Protected metadata error */
+hid_t H5E_NOTCACHED_g      = FAIL;      /* Metadata not currently cached */
+hid_t H5E_SYSTEM_g         = FAIL;      /* Internal error detected */
+hid_t H5E_CANTINS_g        = FAIL;      /* Unable to insert metadata into cache */
+hid_t H5E_CANTPROTECT_g    = FAIL;      /* Unable to protect metadata */
+hid_t H5E_CANTUNPROTECT_g  = FAIL;      /* Unable to unprotect metadata */
+hid_t H5E_CANTPIN_g        = FAIL;      /* Unable to pin cache entry */
+hid_t H5E_CANTUNPIN_g      = FAIL;      /* Unable to un-pin cache entry */
+hid_t H5E_CANTMARKDIRTY_g  = FAIL;      /* Unable to mark a pinned entry as dirty */
+hid_t H5E_CANTDIRTY_g      = FAIL;      /* Unable to mark metadata as dirty */
+hid_t H5E_CANTEXPUNGE_g    = FAIL;      /* Unable to expunge a metadata cache entry */
+hid_t H5E_CANTRESIZE_g     = FAIL;      /* Unable to resize a metadata cache entry */
 
 /* Plugin errors */
-hid_t H5E_OPENERROR_g = FAIL; /* Can't open directory or file */
+hid_t H5E_OPENERROR_g      = FAIL;      /* Can't open directory or file */
 
-/* File accessibilty errors */
-hid_t H5E_FILEEXISTS_g    = FAIL; /* File already exists */
-hid_t H5E_FILEOPEN_g      = FAIL; /* File already open */
-hid_t H5E_CANTCREATE_g    = FAIL; /* Unable to create file */
-hid_t H5E_CANTOPENFILE_g  = FAIL; /* Unable to open file */
-hid_t H5E_CANTCLOSEFILE_g = FAIL; /* Unable to close file */
-hid_t H5E_NOTHDF5_g       = FAIL; /* Not an HDF5 file */
-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 */
+/* I/O pipeline errors */
+hid_t H5E_NOFILTER_g       = FAIL;      /* Requested filter is not available */
+hid_t H5E_CALLBACK_g       = FAIL;      /* Callback failed */
+hid_t H5E_CANAPPLY_g       = FAIL;      /* Error from filter 'can apply' callback */
+hid_t H5E_SETLOCAL_g       = FAIL;      /* Error from filter 'set local' callback */
+hid_t H5E_NOENCODER_g      = FAIL;      /* Filter present but encoding disabled */
+hid_t H5E_CANTFILTER_g     = FAIL;      /* Filter operation failed */
 
-/* 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 */
+/* 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 */
+hid_t H5E_BADITER_g        = FAIL;      /* Iteration failed */
+hid_t H5E_CANTPACK_g       = FAIL;      /* Can't pack messages */
+hid_t H5E_CANTRESET_g      = FAIL;      /* Can't reset object */
+hid_t H5E_CANTRENAME_g     = FAIL;      /* Unable to rename object */
 
-/* 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 */
-hid_t H5E_CANTLOAD_g      = FAIL; /* Unable to load metadata into cache */
-hid_t H5E_PROTECT_g       = FAIL; /* Protected metadata error */
-hid_t H5E_NOTCACHED_g     = FAIL; /* Metadata not currently cached */
-hid_t H5E_SYSTEM_g        = FAIL; /* Internal error detected */
-hid_t H5E_CANTINS_g       = FAIL; /* Unable to insert metadata into cache */
-hid_t H5E_CANTPROTECT_g   = FAIL; /* Unable to protect metadata */
-hid_t H5E_CANTUNPROTECT_g = FAIL; /* Unable to unprotect metadata */
-hid_t H5E_CANTPIN_g       = FAIL; /* Unable to pin cache entry */
-hid_t H5E_CANTUNPIN_g     = FAIL; /* Unable to un-pin cache entry */
-hid_t H5E_CANTMARKDIRTY_g = FAIL; /* Unable to mark a pinned entry as dirty */
-hid_t H5E_CANTDIRTY_g     = FAIL; /* Unable to mark metadata as dirty */
-hid_t H5E_CANTEXPUNGE_g   = FAIL; /* Unable to expunge a metadata cache entry */
-hid_t H5E_CANTRESIZE_g    = FAIL; /* Unable to resize a metadata cache entry */
+/* 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_PATH_g           = FAIL;      /* Problem with path to object */
+
+/* File accessibilty errors */
+hid_t H5E_FILEEXISTS_g     = FAIL;      /* File already exists */
+hid_t H5E_FILEOPEN_g       = FAIL;      /* File already open */
+hid_t H5E_CANTCREATE_g     = FAIL;      /* Unable to create file */
+hid_t H5E_CANTOPENFILE_g   = FAIL;      /* Unable to open file */
+hid_t H5E_CANTCLOSEFILE_g  = FAIL;      /* Unable to close file */
+hid_t H5E_NOTHDF5_g        = FAIL;      /* Not an HDF5 file */
+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 */
+
+/* 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 */
+hid_t H5E_SETDISALLOWED_g  = FAIL;      /* Disallowed operation */
 
 /* Link related errors */
-hid_t H5E_TRAVERSE_g      = FAIL; /* Link traversal failure */
-hid_t H5E_NLINKS_g        = FAIL; /* Too many soft links in path */
-hid_t H5E_NOTREGISTERED_g = FAIL; /* Link class not registered */
-hid_t H5E_CANTMOVE_g      = FAIL; /* Can't move object */
-hid_t H5E_CANTSORT_g      = FAIL; /* Can't sort objects */
+hid_t H5E_TRAVERSE_g       = FAIL;      /* Link traversal failure */
+hid_t H5E_NLINKS_g         = FAIL;      /* Too many soft links in path */
+hid_t H5E_NOTREGISTERED_g  = FAIL;      /* Link class not registered */
+hid_t H5E_CANTMOVE_g       = FAIL;      /* Can't move object */
+hid_t H5E_CANTSORT_g       = FAIL;      /* Can't sort objects */
 
-/* Parallel MPI errors */
-hid_t H5E_MPI_g       = FAIL; /* Some MPI function failed */
-hid_t H5E_MPIERRSTR_g = FAIL; /* MPI Error String */
-hid_t H5E_CANTRECV_g  = FAIL; /* Can't receive data */
+/* 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 */
 
-/* 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 */
+/* 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 */
 
-/* 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 */
+/* No error */
+hid_t H5E_NONE_MINOR_g     = FAIL;      /* No error */
 
 /* 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_CANTREDISTRIBUTE_g = FAIL; /* Unable to redistribute records */
-hid_t H5E_CANTSWAP_g         = FAIL; /* Unable to swap records */
-hid_t H5E_CANTINSERT_g       = FAIL; /* Unable to insert object */
-hid_t H5E_CANTLIST_g         = FAIL; /* Unable to list node */
-hid_t H5E_CANTMODIFY_g       = FAIL; /* Unable to modify record */
-hid_t H5E_CANTREMOVE_g       = FAIL; /* Unable to remove object */
-
-/* Datatype conversion errors */
-hid_t H5E_CANTCONVERT_g = FAIL; /* Can't convert datatypes */
-hid_t H5E_BADSIZE_g     = FAIL; /* Bad size for object */
+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_CANTREDISTRIBUTE_g = FAIL;      /* Unable to redistribute records */
+hid_t H5E_CANTSWAP_g       = FAIL;      /* Unable to swap records */
+hid_t H5E_CANTINSERT_g     = FAIL;      /* Unable to insert object */
+hid_t H5E_CANTLIST_g       = FAIL;      /* Unable to list node */
+hid_t H5E_CANTMODIFY_g     = FAIL;      /* Unable to modify record */
+hid_t H5E_CANTREMOVE_g     = FAIL;      /* Unable to remove object */
 
 #endif /* H5Edefin_H */
diff --git a/src/H5Einit.h b/src/H5Einit.h
index accd38c..ec5510e 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -14,6 +14,7 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
+
 #ifndef _H5Einit_H
 #define _H5Einit_H
 
@@ -21,786 +22,787 @@
 /* Major error codes */
 /*********************/
 
-HDassert(H5E_DATASET_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset")) == NULL)
+HDassert(H5E_ATTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FUNC_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit")) == NULL)
+HDassert(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_FUNC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_STORAGE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage")) == NULL)
+HDassert(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, FALSE)) < 0)
+if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FILE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessibilty")) == NULL)
+HDassert(H5E_SLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Skip Lists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SOHM_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Shared Object Header Messages")) == NULL)
+HDassert(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_SOHM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SYM_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table")) == NULL)
+HDassert(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_SYM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PLUGIN_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Plugin for dynamically loaded library")) == NULL)
+HDassert(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_PLUGIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_VFL_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer")) == NULL)
+HDassert(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_VFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_INTERNAL_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)")) == NULL)
+HDassert(H5E_IO_g==(-1));
+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_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BTREE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node")) == NULL)
+HDassert(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_BTREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_REFERENCE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "References")) == NULL)
+HDassert(H5E_NONE_MAJOR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "No error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NONE_MAJOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_DATASPACE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace")) == NULL)
+HDassert(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_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_RESOURCE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable")) == NULL)
+HDassert(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_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PLIST_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists")) == NULL)
+HDassert(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_PLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_LINK_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Links")) == NULL)
+HDassert(H5E_PLUGIN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Plugin for dynamically loaded library"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_PLUGIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_DATATYPE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype")) == NULL)
+HDassert(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_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_RS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings")) == NULL)
+HDassert(H5E_LINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Links"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_HEAP_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap")) == NULL)
+HDassert(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_HEAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_OHDR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header")) == NULL)
+HDassert(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_OHDR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ATOM_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom")) == NULL)
+HDassert(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_ATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ATTR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute")) == NULL)
+HDassert(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_ATTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NONE_MAJOR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "No error")) == NULL)
+HDassert(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_NONE_MAJOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_IO_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O")) == NULL)
+HDassert(H5E_SOHM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Shared Object Header Messages"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SOHM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SLIST_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Skip Lists")) == NULL)
+HDassert(H5E_FILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessibilty"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_SLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_EFL_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list")) == NULL)
+HDassert(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_EFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_TST_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees")) == NULL)
+HDassert(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_TST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ARGS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Invalid arguments to routine")) == NULL)
+HDassert(H5E_FSPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Free Space Manager"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_FSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ERROR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API")) == NULL)
+HDassert(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_ERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PLINE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters")) == NULL)
+HDassert(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_PLINE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FSPACE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Free Space Manager")) == NULL)
+HDassert(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_FSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CACHE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache")) == NULL)
+HDassert(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_CACHE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /*********************/
 /* Minor error codes */
 /*********************/
 
-/* Generic low-level file I/O errors */
-HDassert(H5E_SEEKERROR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed")) == NULL)
+
+/* Argument errors */
+HDassert(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_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_READERROR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed")) == NULL)
+HDassert(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_READERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_WRITEERROR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed")) == NULL)
+HDassert(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_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CLOSEERROR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed")) == NULL)
+HDassert(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_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_OVERFLOW_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed")) == NULL)
+HDassert(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_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FCNTL_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed")) == NULL)
+
+/* Datatype conversion errors */
+HDassert(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_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Resource errors */
-HDassert(H5E_NOSPACE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation")) == NULL)
+HDassert(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_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTALLOC_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate space")) == NULL)
+
+/* Heap errors */
+HDassert(H5E_CANTRESTORE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't restore condition"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTRESTORE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOPY_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object")) == NULL)
+HDassert(H5E_CANTCOMPUTE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compute value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCOMPUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTFREE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object")) == NULL)
+HDassert(H5E_CANTEXTEND_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't extend heap's space"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTEXTEND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ALREADYEXISTS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists")) == NULL)
+HDassert(H5E_CANTATTACH_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't attach object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTATTACH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTLOCK_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object")) == NULL)
+HDassert(H5E_CANTUPDATE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't update object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTUPDATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUNLOCK_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object")) == NULL)
+HDassert(H5E_CANTOPERATE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't operate on object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTOPERATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTGC_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect")) == NULL)
+
+/* Free space errors */
+HDassert(H5E_CANTMERGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't merge objects"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTMERGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTGETSIZE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size")) == NULL)
+HDassert(H5E_CANTREVIVE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't revive object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTREVIVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_OBJOPEN_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object is already open")) == NULL)
+HDassert(H5E_CANTSHRINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't shrink container"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_OBJOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSHRINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Heap errors */
-HDassert(H5E_CANTRESTORE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't restore condition")) == NULL)
+/* Resource errors */
+HDassert(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_CANTRESTORE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOMPUTE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compute value")) == NULL)
+HDassert(H5E_CANTALLOC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate space"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCOMPUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTEXTEND_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't extend heap's space")) == NULL)
+HDassert(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_CANTEXTEND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTATTACH_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't attach object")) == NULL)
+HDassert(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_CANTATTACH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUPDATE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't update object")) == NULL)
+HDassert(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_CANTUPDATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTOPERATE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't operate on object")) == NULL)
+HDassert(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_CANTOPERATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Function entry/exit interface errors */
-HDassert(H5E_CANTINIT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object")) == NULL)
+HDassert(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, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(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_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ALREADYINIT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized")) == NULL)
+HDassert(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_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRELEASE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object")) == NULL)
+HDassert(H5E_OBJOPEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object is already open"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_OBJOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Property list errors */
-HDassert(H5E_CANTGET_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value")) == NULL)
+/* Generic low-level file I/O errors */
+HDassert(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, FALSE)) < 0)
+if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSET_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value")) == NULL)
+HDassert(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, FALSE)) < 0)
+if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_DUPCLASS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class")) == NULL)
+HDassert(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, FALSE)) < 0)
+if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SETDISALLOWED_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Disallowed operation")) == NULL)
+HDassert(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_SETDISALLOWED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Free space errors */
-HDassert(H5E_CANTMERGE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't merge objects")) == NULL)
+HDassert(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_CANTMERGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREVIVE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't revive object")) == NULL)
+HDassert(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_CANTREVIVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSHRINK_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't shrink container")) == NULL)
+
+/* System level errors */
+HDassert(H5E_SYSERRSTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "System error message"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTSHRINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SYSERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Object header related errors */
-HDassert(H5E_LINKCOUNT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count")) == NULL)
+/* Parallel MPI errors */
+HDassert(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_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_VERSION_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number")) == NULL)
+HDassert(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_VERSION_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_ALIGNMENT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error")) == NULL)
+HDassert(H5E_CANTRECV_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADMESG_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message")) == NULL)
+
+/* Dataspace errors */
+HDassert(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_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDELETE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message")) == NULL)
+HDassert(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_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADITER_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Iteration failed")) == NULL)
+HDassert(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_BADITER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTPACK_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't pack messages")) == NULL)
+HDassert(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_CANTPACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRESET_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object")) == NULL)
+HDassert(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_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRENAME_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object")) == NULL)
+HDassert(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_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* System level errors */
-HDassert(H5E_SYSERRSTR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "System error message")) == NULL)
+/* Cache related errors */
+HDassert(H5E_CANTFLUSH_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_SYSERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* I/O pipeline errors */
-HDassert(H5E_NOFILTER_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available")) == NULL)
+HDassert(H5E_CANTSERIALIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to serialize data from cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSERIALIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CALLBACK_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed")) == NULL)
+HDassert(H5E_CANTLOAD_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANAPPLY_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback")) == NULL)
+HDassert(H5E_PROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SETLOCAL_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback")) == NULL)
+HDassert(H5E_NOTCACHED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOENCODER_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled")) == NULL)
+HDassert(H5E_SYSTEM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Internal error detected"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SYSTEM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTFILTER_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Filter operation failed")) == NULL)
+HDassert(H5E_CANTINS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Group related errors */
-HDassert(H5E_CANTOPENOBJ_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object")) == NULL)
+HDassert(H5E_CANTPROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCLOSEOBJ_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object")) == NULL)
+HDassert(H5E_CANTUNPROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_COMPLEN_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long")) == NULL)
+HDassert(H5E_CANTPIN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to pin cache entry"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PATH_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with path to object")) == NULL)
+HDassert(H5E_CANTUNPIN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to un-pin cache entry"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_PATH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTUNPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* No error */
-HDassert(H5E_NONE_MINOR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "No error")) == NULL)
+HDassert(H5E_CANTMARKDIRTY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark a pinned entry as dirty"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTMARKDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Plugin errors */
-HDassert(H5E_OPENERROR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file")) == NULL)
+HDassert(H5E_CANTDIRTY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* File accessibilty errors */
-HDassert(H5E_FILEEXISTS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists")) == NULL)
+HDassert(H5E_CANTEXPUNGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to expunge a metadata cache entry"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTEXPUNGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_FILEOPEN_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "File already open")) == NULL)
+HDassert(H5E_CANTRESIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to resize a metadata cache entry"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTRESIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCREATE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file")) == NULL)
+
+/* Plugin errors */
+HDassert(H5E_OPENERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTOPENFILE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file")) == NULL)
+
+/* I/O pipeline errors */
+HDassert(H5E_NOFILTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCLOSEFILE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file")) == NULL)
+HDassert(H5E_CALLBACK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOTHDF5_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file")) == NULL)
+HDassert(H5E_CANAPPLY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADFILE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed")) == NULL)
+HDassert(H5E_SETLOCAL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_TRUNCATED_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated")) == NULL)
+HDassert(H5E_NOENCODER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_MOUNT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error")) == NULL)
+HDassert(H5E_CANTFILTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter operation failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Object atom related errors */
-HDassert(H5E_BADATOM_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)")) == NULL)
+/* Object header related errors */
+HDassert(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_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADGROUP_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information")) == NULL)
+HDassert(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_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREGISTER_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom")) == NULL)
+HDassert(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_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTINC_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count")) == NULL)
+HDassert(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_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDEC_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count")) == NULL)
+HDassert(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_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOIDS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group")) == NULL)
+HDassert(H5E_BADITER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Iteration failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADITER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Cache related errors */
-HDassert(H5E_CANTFLUSH_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache")) == NULL)
+HDassert(H5E_CANTPACK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't pack messages"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTPACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSERIALIZE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to serialize data from cache")) == NULL)
+HDassert(H5E_CANTRESET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTSERIALIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTLOAD_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache")) == NULL)
+HDassert(H5E_CANTRENAME_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_PROTECT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error")) == NULL)
+
+/* Group related errors */
+HDassert(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_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOTCACHED_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached")) == NULL)
+HDassert(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_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_SYSTEM_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Internal error detected")) == NULL)
+HDassert(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_SYSTEM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTINS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache")) == NULL)
+HDassert(H5E_PATH_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with path to object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_PATH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTPROTECT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata")) == NULL)
+
+/* File accessibilty errors */
+HDassert(H5E_FILEEXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUNPROTECT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata")) == NULL)
+HDassert(H5E_FILEOPEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File already open"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTPIN_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to pin cache entry")) == NULL)
+HDassert(H5E_CANTCREATE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTUNPIN_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to un-pin cache entry")) == NULL)
+HDassert(H5E_CANTOPENFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTUNPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTMARKDIRTY_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark a pinned entry as dirty")) == NULL)
+HDassert(H5E_CANTCLOSEFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTMARKDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDIRTY_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty")) == NULL)
+HDassert(H5E_NOTHDF5_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTEXPUNGE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to expunge a metadata cache entry")) == NULL)
+HDassert(H5E_BADFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTEXPUNGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRESIZE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to resize a metadata cache entry")) == NULL)
+HDassert(H5E_TRUNCATED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTRESIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Link related errors */
-HDassert(H5E_TRAVERSE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Link traversal failure")) == NULL)
+HDassert(H5E_MOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_TRAVERSE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NLINKS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Too many soft links in path")) == NULL)
+
+/* Property list errors */
+HDassert(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_NLINKS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_NOTREGISTERED_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered")) == NULL)
+HDassert(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_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTMOVE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object")) == NULL)
+HDassert(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_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSORT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't sort objects")) == NULL)
+HDassert(H5E_SETDISALLOWED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Disallowed operation"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTSORT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_SETDISALLOWED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Parallel MPI errors */
-HDassert(H5E_MPI_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed")) == NULL)
+/* Link related errors */
+HDassert(H5E_TRAVERSE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Link traversal failure"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_TRAVERSE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_MPIERRSTR_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String")) == NULL)
+HDassert(H5E_NLINKS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Too many soft links in path"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NLINKS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTRECV_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data")) == NULL)
+HDassert(H5E_NOTREGISTERED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Dataspace errors */
-HDassert(H5E_CANTCLIP_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region")) == NULL)
+HDassert(H5E_CANTMOVE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOUNT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements")) == NULL)
+HDassert(H5E_CANTSORT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't sort objects"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSORT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSELECT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab")) == NULL)
+
+/* Object atom related errors */
+HDassert(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_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTNEXT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location")) == NULL)
+HDassert(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_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADSELECT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection")) == NULL)
+HDassert(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_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTCOMPARE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects")) == NULL)
+HDassert(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_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Argument errors */
-HDassert(H5E_UNINITIALIZED_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized")) == NULL)
+HDassert(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_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_UNSUPPORTED_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported")) == NULL)
+HDassert(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_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADTYPE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type")) == NULL)
+
+/* Function entry/exit interface errors */
+HDassert(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_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADRANGE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range")) == NULL)
+HDassert(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_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADVALUE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value")) == NULL)
+HDassert(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_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* B-tree related errors */
-HDassert(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, FALSE)) < 0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_EXISTS_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists")) == NULL)
+/* No error */
+HDassert(H5E_NONE_MINOR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "No error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTENCODE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value")) == NULL)
+
+/* B-tree related errors */
+HDassert(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_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTDECODE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value")) == NULL)
+HDassert(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_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSPLIT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node")) == NULL)
+HDassert(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_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREDISTRIBUTE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to redistribute records")) == NULL)
+HDassert(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_CANTREDISTRIBUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTSWAP_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to swap records")) == NULL)
+HDassert(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_CANTSWAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTINSERT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object")) == NULL)
+HDassert(H5E_CANTREDISTRIBUTE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to redistribute records"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTREDISTRIBUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTLIST_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node")) == NULL)
+HDassert(H5E_CANTSWAP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to swap records"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTSWAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTMODIFY_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to modify record")) == NULL)
+HDassert(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_CANTMODIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_CANTREMOVE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object")) == NULL)
+HDassert(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_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Datatype conversion errors */
-HDassert(H5E_CANTCONVERT_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes")) == NULL)
+HDassert(H5E_CANTMODIFY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to modify record"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTMODIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-HDassert(H5E_BADSIZE_g == (-1));
-if ((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object")) == NULL)
+HDassert(H5E_CANTREMOVE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if ((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE)) < 0)
+if((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<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 3c65f07..fc874df 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -14,6 +14,7 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
+
 #ifndef _H5Epubgen_H
 #define _H5Epubgen_H
 
@@ -25,98 +26,124 @@ extern "C" {
 /* Major error codes */
 /*********************/
 
-#define H5E_DATASET    (H5OPEN H5E_DATASET_g)
-#define H5E_FUNC       (H5OPEN H5E_FUNC_g)
-#define H5E_STORAGE    (H5OPEN H5E_STORAGE_g)
-#define H5E_FILE       (H5OPEN H5E_FILE_g)
-#define H5E_SOHM       (H5OPEN H5E_SOHM_g)
-#define H5E_SYM        (H5OPEN H5E_SYM_g)
-#define H5E_PLUGIN     (H5OPEN H5E_PLUGIN_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_LINK       (H5OPEN H5E_LINK_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_ATOM       (H5OPEN H5E_ATOM_g)
-#define H5E_ATTR       (H5OPEN H5E_ATTR_g)
-#define H5E_NONE_MAJOR (H5OPEN H5E_NONE_MAJOR_g)
-#define H5E_IO         (H5OPEN H5E_IO_g)
-#define H5E_SLIST      (H5OPEN H5E_SLIST_g)
-#define H5E_EFL        (H5OPEN H5E_EFL_g)
-#define H5E_TST        (H5OPEN H5E_TST_g)
-#define H5E_ARGS       (H5OPEN H5E_ARGS_g)
-#define H5E_ERROR      (H5OPEN H5E_ERROR_g)
-#define H5E_PLINE      (H5OPEN H5E_PLINE_g)
-#define H5E_FSPACE     (H5OPEN H5E_FSPACE_g)
-#define H5E_CACHE      (H5OPEN H5E_CACHE_g)
-H5_DLLVAR hid_t H5E_DATASET_g;    /* Dataset */
-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 accessibilty */
-H5_DLLVAR hid_t H5E_SOHM_g;       /* Shared Object Header Messages */
-H5_DLLVAR hid_t H5E_SYM_g;        /* Symbol table */
-H5_DLLVAR hid_t H5E_PLUGIN_g;     /* Plugin for dynamically loaded library */
-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_LINK_g;       /* Links */
-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_ATOM_g;       /* Object atom */
-H5_DLLVAR hid_t H5E_ATTR_g;       /* Attribute */
-H5_DLLVAR hid_t H5E_NONE_MAJOR_g; /* No error */
-H5_DLLVAR hid_t H5E_IO_g;         /* Low-level I/O */
-H5_DLLVAR hid_t H5E_SLIST_g;      /* Skip Lists */
-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_ERROR_g;      /* Error API */
-H5_DLLVAR hid_t H5E_PLINE_g;      /* Data filters */
-H5_DLLVAR hid_t H5E_FSPACE_g;     /* Free Space Manager */
-H5_DLLVAR hid_t H5E_CACHE_g;      /* Object cache */
+#define H5E_ATTR             (H5OPEN H5E_ATTR_g)
+#define H5E_ATOM             (H5OPEN H5E_ATOM_g)
+#define H5E_DATASPACE        (H5OPEN H5E_DATASPACE_g)
+#define H5E_SLIST            (H5OPEN H5E_SLIST_g)
+#define H5E_OHDR             (H5OPEN H5E_OHDR_g)
+#define H5E_EFL              (H5OPEN H5E_EFL_g)
+#define H5E_TST              (H5OPEN H5E_TST_g)
+#define H5E_BTREE            (H5OPEN H5E_BTREE_g)
+#define H5E_IO               (H5OPEN H5E_IO_g)
+#define H5E_VFL              (H5OPEN H5E_VFL_g)
+#define H5E_NONE_MAJOR       (H5OPEN H5E_NONE_MAJOR_g)
+#define H5E_REFERENCE        (H5OPEN H5E_REFERENCE_g)
+#define H5E_PLINE            (H5OPEN H5E_PLINE_g)
+#define H5E_DATASET          (H5OPEN H5E_DATASET_g)
+#define H5E_PLUGIN           (H5OPEN H5E_PLUGIN_g)
+#define H5E_ARGS             (H5OPEN H5E_ARGS_g)
+#define H5E_LINK             (H5OPEN H5E_LINK_g)
+#define H5E_SYM              (H5OPEN H5E_SYM_g)
+#define H5E_HEAP             (H5OPEN H5E_HEAP_g)
+#define H5E_ERROR            (H5OPEN H5E_ERROR_g)
+#define H5E_FUNC             (H5OPEN H5E_FUNC_g)
+#define H5E_PLIST            (H5OPEN H5E_PLIST_g)
+#define H5E_SOHM             (H5OPEN H5E_SOHM_g)
+#define H5E_FILE             (H5OPEN H5E_FILE_g)
+#define H5E_STORAGE          (H5OPEN H5E_STORAGE_g)
+#define H5E_DATATYPE         (H5OPEN H5E_DATATYPE_g)
+#define H5E_FSPACE           (H5OPEN H5E_FSPACE_g)
+#define H5E_RESOURCE         (H5OPEN H5E_RESOURCE_g)
+#define H5E_INTERNAL         (H5OPEN H5E_INTERNAL_g)
+#define H5E_RS               (H5OPEN H5E_RS_g)
+#define H5E_CACHE            (H5OPEN H5E_CACHE_g)
+H5_DLLVAR hid_t H5E_ATTR_g;          /* Attribute */
+H5_DLLVAR hid_t H5E_ATOM_g;          /* Object atom */
+H5_DLLVAR hid_t H5E_DATASPACE_g;     /* Dataspace */
+H5_DLLVAR hid_t H5E_SLIST_g;         /* Skip Lists */
+H5_DLLVAR hid_t H5E_OHDR_g;          /* Object header */
+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_BTREE_g;         /* B-Tree node */
+H5_DLLVAR hid_t H5E_IO_g;            /* Low-level I/O */
+H5_DLLVAR hid_t H5E_VFL_g;           /* Virtual File Layer */
+H5_DLLVAR hid_t H5E_NONE_MAJOR_g;    /* No error */
+H5_DLLVAR hid_t H5E_REFERENCE_g;     /* References */
+H5_DLLVAR hid_t H5E_PLINE_g;         /* Data filters */
+H5_DLLVAR hid_t H5E_DATASET_g;       /* Dataset */
+H5_DLLVAR hid_t H5E_PLUGIN_g;        /* Plugin for dynamically loaded library */
+H5_DLLVAR hid_t H5E_ARGS_g;          /* Invalid arguments to routine */
+H5_DLLVAR hid_t H5E_LINK_g;          /* Links */
+H5_DLLVAR hid_t H5E_SYM_g;           /* Symbol table */
+H5_DLLVAR hid_t H5E_HEAP_g;          /* Heap */
+H5_DLLVAR hid_t H5E_ERROR_g;         /* Error API */
+H5_DLLVAR hid_t H5E_FUNC_g;          /* Function entry/exit */
+H5_DLLVAR hid_t H5E_PLIST_g;         /* Property lists */
+H5_DLLVAR hid_t H5E_SOHM_g;          /* Shared Object Header Messages */
+H5_DLLVAR hid_t H5E_FILE_g;          /* File accessibilty */
+H5_DLLVAR hid_t H5E_STORAGE_g;       /* Data storage */
+H5_DLLVAR hid_t H5E_DATATYPE_g;      /* Datatype */
+H5_DLLVAR hid_t H5E_FSPACE_g;        /* Free Space Manager */
+H5_DLLVAR hid_t H5E_RESOURCE_g;      /* Resource unavailable */
+H5_DLLVAR hid_t H5E_INTERNAL_g;      /* Internal error (too specific to document in detail) */
+H5_DLLVAR hid_t H5E_RS_g;            /* Reference Counted Strings */
+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 */
+/* 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 */
+
+/* Heap errors */
+#define H5E_CANTRESTORE      (H5OPEN H5E_CANTRESTORE_g)
+#define H5E_CANTCOMPUTE      (H5OPEN H5E_CANTCOMPUTE_g)
+#define H5E_CANTEXTEND       (H5OPEN H5E_CANTEXTEND_g)
+#define H5E_CANTATTACH       (H5OPEN H5E_CANTATTACH_g)
+#define H5E_CANTUPDATE       (H5OPEN H5E_CANTUPDATE_g)
+#define H5E_CANTOPERATE      (H5OPEN H5E_CANTOPERATE_g)
+H5_DLLVAR hid_t H5E_CANTRESTORE_g;   /* Can't restore condition */
+H5_DLLVAR hid_t H5E_CANTCOMPUTE_g;   /* Can't compute value */
+H5_DLLVAR hid_t H5E_CANTEXTEND_g;    /* Can't extend heap's space */
+H5_DLLVAR hid_t H5E_CANTATTACH_g;    /* Can't attach object */
+H5_DLLVAR hid_t H5E_CANTUPDATE_g;    /* Can't update object */
+H5_DLLVAR hid_t H5E_CANTOPERATE_g;   /* Can't operate on object */
+
+/* Free space errors */
+#define H5E_CANTMERGE        (H5OPEN H5E_CANTMERGE_g)
+#define H5E_CANTREVIVE       (H5OPEN H5E_CANTREVIVE_g)
+#define H5E_CANTSHRINK       (H5OPEN H5E_CANTSHRINK_g)
+H5_DLLVAR hid_t H5E_CANTMERGE_g;     /* Can't merge objects */
+H5_DLLVAR hid_t H5E_CANTREVIVE_g;    /* Can't revive object */
+H5_DLLVAR hid_t H5E_CANTSHRINK_g;    /* Can't shrink container */
 
 /* Resource errors */
-#define H5E_NOSPACE       (H5OPEN H5E_NOSPACE_g)
-#define H5E_CANTALLOC     (H5OPEN H5E_CANTALLOC_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)
-#define H5E_OBJOPEN       (H5OPEN H5E_OBJOPEN_g)
+#define H5E_NOSPACE          (H5OPEN H5E_NOSPACE_g)
+#define H5E_CANTALLOC        (H5OPEN H5E_CANTALLOC_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)
+#define H5E_OBJOPEN          (H5OPEN H5E_OBJOPEN_g)
 H5_DLLVAR hid_t H5E_NOSPACE_g;       /* No space available for allocation */
 H5_DLLVAR hid_t H5E_CANTALLOC_g;     /* Can't allocate space */
 H5_DLLVAR hid_t H5E_CANTCOPY_g;      /* Unable to copy object */
@@ -128,152 +155,62 @@ H5_DLLVAR hid_t H5E_CANTGC_g;        /* Unable to garbage collect */
 H5_DLLVAR hid_t H5E_CANTGETSIZE_g;   /* Unable to compute size */
 H5_DLLVAR hid_t H5E_OBJOPEN_g;       /* Object is already open */
 
-/* Heap errors */
-#define H5E_CANTRESTORE (H5OPEN H5E_CANTRESTORE_g)
-#define H5E_CANTCOMPUTE (H5OPEN H5E_CANTCOMPUTE_g)
-#define H5E_CANTEXTEND  (H5OPEN H5E_CANTEXTEND_g)
-#define H5E_CANTATTACH  (H5OPEN H5E_CANTATTACH_g)
-#define H5E_CANTUPDATE  (H5OPEN H5E_CANTUPDATE_g)
-#define H5E_CANTOPERATE (H5OPEN H5E_CANTOPERATE_g)
-H5_DLLVAR hid_t H5E_CANTRESTORE_g; /* Can't restore condition */
-H5_DLLVAR hid_t H5E_CANTCOMPUTE_g; /* Can't compute value */
-H5_DLLVAR hid_t H5E_CANTEXTEND_g;  /* Can't extend heap's space */
-H5_DLLVAR hid_t H5E_CANTATTACH_g;  /* Can't attach object */
-H5_DLLVAR hid_t H5E_CANTUPDATE_g;  /* Can't update object */
-H5_DLLVAR hid_t H5E_CANTOPERATE_g; /* Can't operate on object */
-
-/* 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)
-#define H5E_DUPCLASS      (H5OPEN H5E_DUPCLASS_g)
-#define H5E_SETDISALLOWED (H5OPEN H5E_SETDISALLOWED_g)
-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 */
-H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
-
-/* Free space errors */
-#define H5E_CANTMERGE  (H5OPEN H5E_CANTMERGE_g)
-#define H5E_CANTREVIVE (H5OPEN H5E_CANTREVIVE_g)
-#define H5E_CANTSHRINK (H5OPEN H5E_CANTSHRINK_g)
-H5_DLLVAR hid_t H5E_CANTMERGE_g;  /* Can't merge objects */
-H5_DLLVAR hid_t H5E_CANTREVIVE_g; /* Can't revive object */
-H5_DLLVAR hid_t H5E_CANTSHRINK_g; /* Can't shrink container */
-
-/* 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)
-#define H5E_BADITER    (H5OPEN H5E_BADITER_g)
-#define H5E_CANTPACK   (H5OPEN H5E_CANTPACK_g)
-#define H5E_CANTRESET  (H5OPEN H5E_CANTRESET_g)
-#define H5E_CANTRENAME (H5OPEN H5E_CANTRENAME_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 */
-H5_DLLVAR hid_t H5E_BADITER_g;    /* Iteration failed */
-H5_DLLVAR hid_t H5E_CANTPACK_g;   /* Can't pack messages */
-H5_DLLVAR hid_t H5E_CANTRESET_g;  /* Can't reset object */
-H5_DLLVAR hid_t H5E_CANTRENAME_g; /* Unable to rename object */
+/* 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 */
 
 /* System level errors */
-#define H5E_SYSERRSTR (H5OPEN H5E_SYSERRSTR_g)
-H5_DLLVAR hid_t H5E_SYSERRSTR_g; /* System error message */
-
-/* I/O pipeline errors */
-#define H5E_NOFILTER   (H5OPEN H5E_NOFILTER_g)
-#define H5E_CALLBACK   (H5OPEN H5E_CALLBACK_g)
-#define H5E_CANAPPLY   (H5OPEN H5E_CANAPPLY_g)
-#define H5E_SETLOCAL   (H5OPEN H5E_SETLOCAL_g)
-#define H5E_NOENCODER  (H5OPEN H5E_NOENCODER_g)
-#define H5E_CANTFILTER (H5OPEN H5E_CANTFILTER_g)
-H5_DLLVAR hid_t H5E_NOFILTER_g;   /* Requested filter is not available */
-H5_DLLVAR hid_t H5E_CALLBACK_g;   /* Callback failed */
-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 */
-H5_DLLVAR hid_t H5E_CANTFILTER_g; /* Filter operation failed */
-
-/* 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_PATH         (H5OPEN H5E_PATH_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_PATH_g;         /* Problem with path to object */
-
-/* No error */
-#define H5E_NONE_MINOR (H5OPEN H5E_NONE_MINOR_g)
-H5_DLLVAR hid_t H5E_NONE_MINOR_g; /* No error */
-
-/* Plugin errors */
-#define H5E_OPENERROR (H5OPEN H5E_OPENERROR_g)
-H5_DLLVAR hid_t H5E_OPENERROR_g; /* Can't open directory or file */
+#define H5E_SYSERRSTR        (H5OPEN H5E_SYSERRSTR_g)
+H5_DLLVAR hid_t H5E_SYSERRSTR_g;     /* System error message */
 
-/* File accessibilty errors */
-#define H5E_FILEEXISTS    (H5OPEN H5E_FILEEXISTS_g)
-#define H5E_FILEOPEN      (H5OPEN H5E_FILEOPEN_g)
-#define H5E_CANTCREATE    (H5OPEN H5E_CANTCREATE_g)
-#define H5E_CANTOPENFILE  (H5OPEN H5E_CANTOPENFILE_g)
-#define H5E_CANTCLOSEFILE (H5OPEN H5E_CANTCLOSEFILE_g)
-#define H5E_NOTHDF5       (H5OPEN H5E_NOTHDF5_g)
-#define H5E_BADFILE       (H5OPEN H5E_BADFILE_g)
-#define H5E_TRUNCATED     (H5OPEN H5E_TRUNCATED_g)
-#define H5E_MOUNT         (H5OPEN H5E_MOUNT_g)
-H5_DLLVAR hid_t H5E_FILEEXISTS_g;    /* File already exists */
-H5_DLLVAR hid_t H5E_FILEOPEN_g;      /* File already open */
-H5_DLLVAR hid_t H5E_CANTCREATE_g;    /* Unable to create file */
-H5_DLLVAR hid_t H5E_CANTOPENFILE_g;  /* Unable to open file */
-H5_DLLVAR hid_t H5E_CANTCLOSEFILE_g; /* Unable to close file */
-H5_DLLVAR hid_t H5E_NOTHDF5_g;       /* Not an HDF5 file */
-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 */
+/* Parallel MPI errors */
+#define H5E_MPI              (H5OPEN H5E_MPI_g)
+#define H5E_MPIERRSTR        (H5OPEN H5E_MPIERRSTR_g)
+#define H5E_CANTRECV         (H5OPEN H5E_CANTRECV_g)
+H5_DLLVAR hid_t H5E_MPI_g;           /* Some MPI function failed */
+H5_DLLVAR hid_t H5E_MPIERRSTR_g;     /* MPI Error String */
+H5_DLLVAR hid_t H5E_CANTRECV_g;      /* Can't receive data */
 
-/* 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 */
+/* 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 */
 
 /* Cache related errors */
-#define H5E_CANTFLUSH     (H5OPEN H5E_CANTFLUSH_g)
-#define H5E_CANTSERIALIZE (H5OPEN H5E_CANTSERIALIZE_g)
-#define H5E_CANTLOAD      (H5OPEN H5E_CANTLOAD_g)
-#define H5E_PROTECT       (H5OPEN H5E_PROTECT_g)
-#define H5E_NOTCACHED     (H5OPEN H5E_NOTCACHED_g)
-#define H5E_SYSTEM        (H5OPEN H5E_SYSTEM_g)
-#define H5E_CANTINS       (H5OPEN H5E_CANTINS_g)
-#define H5E_CANTPROTECT   (H5OPEN H5E_CANTPROTECT_g)
-#define H5E_CANTUNPROTECT (H5OPEN H5E_CANTUNPROTECT_g)
-#define H5E_CANTPIN       (H5OPEN H5E_CANTPIN_g)
-#define H5E_CANTUNPIN     (H5OPEN H5E_CANTUNPIN_g)
-#define H5E_CANTMARKDIRTY (H5OPEN H5E_CANTMARKDIRTY_g)
-#define H5E_CANTDIRTY     (H5OPEN H5E_CANTDIRTY_g)
-#define H5E_CANTEXPUNGE   (H5OPEN H5E_CANTEXPUNGE_g)
-#define H5E_CANTRESIZE    (H5OPEN H5E_CANTRESIZE_g)
+#define H5E_CANTFLUSH        (H5OPEN H5E_CANTFLUSH_g)
+#define H5E_CANTSERIALIZE    (H5OPEN H5E_CANTSERIALIZE_g)
+#define H5E_CANTLOAD         (H5OPEN H5E_CANTLOAD_g)
+#define H5E_PROTECT          (H5OPEN H5E_PROTECT_g)
+#define H5E_NOTCACHED        (H5OPEN H5E_NOTCACHED_g)
+#define H5E_SYSTEM           (H5OPEN H5E_SYSTEM_g)
+#define H5E_CANTINS          (H5OPEN H5E_CANTINS_g)
+#define H5E_CANTPROTECT      (H5OPEN H5E_CANTPROTECT_g)
+#define H5E_CANTUNPROTECT    (H5OPEN H5E_CANTUNPROTECT_g)
+#define H5E_CANTPIN          (H5OPEN H5E_CANTPIN_g)
+#define H5E_CANTUNPIN        (H5OPEN H5E_CANTUNPIN_g)
+#define H5E_CANTMARKDIRTY    (H5OPEN H5E_CANTMARKDIRTY_g)
+#define H5E_CANTDIRTY        (H5OPEN H5E_CANTDIRTY_g)
+#define H5E_CANTEXPUNGE      (H5OPEN H5E_CANTEXPUNGE_g)
+#define H5E_CANTRESIZE       (H5OPEN H5E_CANTRESIZE_g)
 H5_DLLVAR hid_t H5E_CANTFLUSH_g;     /* Unable to flush data from cache */
 H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */
 H5_DLLVAR hid_t H5E_CANTLOAD_g;      /* Unable to load metadata into cache */
@@ -290,51 +227,121 @@ H5_DLLVAR hid_t H5E_CANTDIRTY_g;     /* Unable to mark metadata as dirty */
 H5_DLLVAR hid_t H5E_CANTEXPUNGE_g;   /* Unable to expunge a metadata cache entry */
 H5_DLLVAR hid_t H5E_CANTRESIZE_g;    /* Unable to resize a metadata cache entry */
 
+/* Plugin errors */
+#define H5E_OPENERROR        (H5OPEN H5E_OPENERROR_g)
+H5_DLLVAR hid_t H5E_OPENERROR_g;     /* Can't open directory or file */
+
+/* I/O pipeline errors */
+#define H5E_NOFILTER         (H5OPEN H5E_NOFILTER_g)
+#define H5E_CALLBACK         (H5OPEN H5E_CALLBACK_g)
+#define H5E_CANAPPLY         (H5OPEN H5E_CANAPPLY_g)
+#define H5E_SETLOCAL         (H5OPEN H5E_SETLOCAL_g)
+#define H5E_NOENCODER        (H5OPEN H5E_NOENCODER_g)
+#define H5E_CANTFILTER       (H5OPEN H5E_CANTFILTER_g)
+H5_DLLVAR hid_t H5E_NOFILTER_g;      /* Requested filter is not available */
+H5_DLLVAR hid_t H5E_CALLBACK_g;      /* Callback failed */
+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 */
+H5_DLLVAR hid_t H5E_CANTFILTER_g;    /* Filter operation failed */
+
+/* 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)
+#define H5E_BADITER          (H5OPEN H5E_BADITER_g)
+#define H5E_CANTPACK         (H5OPEN H5E_CANTPACK_g)
+#define H5E_CANTRESET        (H5OPEN H5E_CANTRESET_g)
+#define H5E_CANTRENAME       (H5OPEN H5E_CANTRENAME_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 */
+H5_DLLVAR hid_t H5E_BADITER_g;       /* Iteration failed */
+H5_DLLVAR hid_t H5E_CANTPACK_g;      /* Can't pack messages */
+H5_DLLVAR hid_t H5E_CANTRESET_g;     /* Can't reset object */
+H5_DLLVAR hid_t H5E_CANTRENAME_g;    /* Unable to rename object */
+
+/* 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_PATH             (H5OPEN H5E_PATH_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_PATH_g;          /* Problem with path to object */
+
+/* File accessibilty errors */
+#define H5E_FILEEXISTS       (H5OPEN H5E_FILEEXISTS_g)
+#define H5E_FILEOPEN         (H5OPEN H5E_FILEOPEN_g)
+#define H5E_CANTCREATE       (H5OPEN H5E_CANTCREATE_g)
+#define H5E_CANTOPENFILE     (H5OPEN H5E_CANTOPENFILE_g)
+#define H5E_CANTCLOSEFILE    (H5OPEN H5E_CANTCLOSEFILE_g)
+#define H5E_NOTHDF5          (H5OPEN H5E_NOTHDF5_g)
+#define H5E_BADFILE          (H5OPEN H5E_BADFILE_g)
+#define H5E_TRUNCATED        (H5OPEN H5E_TRUNCATED_g)
+#define H5E_MOUNT            (H5OPEN H5E_MOUNT_g)
+H5_DLLVAR hid_t H5E_FILEEXISTS_g;    /* File already exists */
+H5_DLLVAR hid_t H5E_FILEOPEN_g;      /* File already open */
+H5_DLLVAR hid_t H5E_CANTCREATE_g;    /* Unable to create file */
+H5_DLLVAR hid_t H5E_CANTOPENFILE_g;  /* Unable to open file */
+H5_DLLVAR hid_t H5E_CANTCLOSEFILE_g; /* Unable to close file */
+H5_DLLVAR hid_t H5E_NOTHDF5_g;       /* Not an HDF5 file */
+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 */
+
+/* Property list errors */
+#define H5E_CANTGET          (H5OPEN H5E_CANTGET_g)
+#define H5E_CANTSET          (H5OPEN H5E_CANTSET_g)
+#define H5E_DUPCLASS         (H5OPEN H5E_DUPCLASS_g)
+#define H5E_SETDISALLOWED    (H5OPEN H5E_SETDISALLOWED_g)
+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 */
+H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
+
 /* Link related errors */
-#define H5E_TRAVERSE      (H5OPEN H5E_TRAVERSE_g)
-#define H5E_NLINKS        (H5OPEN H5E_NLINKS_g)
-#define H5E_NOTREGISTERED (H5OPEN H5E_NOTREGISTERED_g)
-#define H5E_CANTMOVE      (H5OPEN H5E_CANTMOVE_g)
-#define H5E_CANTSORT      (H5OPEN H5E_CANTSORT_g)
+#define H5E_TRAVERSE         (H5OPEN H5E_TRAVERSE_g)
+#define H5E_NLINKS           (H5OPEN H5E_NLINKS_g)
+#define H5E_NOTREGISTERED    (H5OPEN H5E_NOTREGISTERED_g)
+#define H5E_CANTMOVE         (H5OPEN H5E_CANTMOVE_g)
+#define H5E_CANTSORT         (H5OPEN H5E_CANTSORT_g)
 H5_DLLVAR hid_t H5E_TRAVERSE_g;      /* Link traversal failure */
 H5_DLLVAR hid_t H5E_NLINKS_g;        /* Too many soft links in path */
 H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */
 H5_DLLVAR hid_t H5E_CANTMOVE_g;      /* Can't move object */
 H5_DLLVAR hid_t H5E_CANTSORT_g;      /* Can't sort objects */
 
-/* Parallel MPI errors */
-#define H5E_MPI       (H5OPEN H5E_MPI_g)
-#define H5E_MPIERRSTR (H5OPEN H5E_MPIERRSTR_g)
-#define H5E_CANTRECV  (H5OPEN H5E_CANTRECV_g)
-H5_DLLVAR hid_t H5E_MPI_g;       /* Some MPI function failed */
-H5_DLLVAR hid_t H5E_MPIERRSTR_g; /* MPI Error String */
-H5_DLLVAR hid_t H5E_CANTRECV_g;  /* Can't receive data */
+/* 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 */
 
-/* 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 */
+/* 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 */
 
-/* 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 */
+/* No error */
+#define H5E_NONE_MINOR       (H5OPEN H5E_NONE_MINOR_g)
+H5_DLLVAR hid_t H5E_NONE_MINOR_g;    /* No error */
 
 /* B-tree related errors */
 #define H5E_NOTFOUND         (H5OPEN H5E_NOTFOUND_g)
@@ -348,23 +355,17 @@ H5_DLLVAR hid_t H5E_BADVALUE_g;      /* Bad value */
 #define H5E_CANTLIST         (H5OPEN H5E_CANTLIST_g)
 #define H5E_CANTMODIFY       (H5OPEN H5E_CANTMODIFY_g)
 #define H5E_CANTREMOVE       (H5OPEN H5E_CANTREMOVE_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_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_CANTREDISTRIBUTE_g; /* Unable to redistribute records */
-H5_DLLVAR hid_t H5E_CANTSWAP_g;         /* Unable to swap records */
-H5_DLLVAR hid_t H5E_CANTINSERT_g;       /* Unable to insert object */
-H5_DLLVAR hid_t H5E_CANTLIST_g;         /* Unable to list node */
-H5_DLLVAR hid_t H5E_CANTMODIFY_g;       /* Unable to modify record */
-H5_DLLVAR hid_t H5E_CANTREMOVE_g;       /* Unable to remove object */
-
-/* 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 */
+H5_DLLVAR hid_t H5E_CANTSWAP_g;      /* Unable to swap records */
+H5_DLLVAR hid_t H5E_CANTINSERT_g;    /* Unable to insert object */
+H5_DLLVAR hid_t H5E_CANTLIST_g;      /* Unable to list node */
+H5_DLLVAR hid_t H5E_CANTMODIFY_g;    /* Unable to modify record */
+H5_DLLVAR hid_t H5E_CANTREMOVE_g;    /* Unable to remove object */
 
 #ifdef __cplusplus
 }
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index 1d9f0f2..5e815af 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -14,89 +14,203 @@
 /* Generated automatically by bin/make_err -- do not edit */
 /* Add new errors to H5err.txt file */
 
+
 #ifndef _H5Eterm_H
 #define _H5Eterm_H
 
 /* Reset major error IDs */
-
-H5E_DATASET_g = H5E_FUNC_g = H5E_STORAGE_g = H5E_FILE_g = H5E_SOHM_g = H5E_SYM_g = H5E_PLUGIN_g = H5E_VFL_g =
-    H5E_INTERNAL_g = H5E_BTREE_g = H5E_REFERENCE_g = H5E_DATASPACE_g = H5E_RESOURCE_g = H5E_PLIST_g =
-        H5E_LINK_g = H5E_DATATYPE_g = H5E_RS_g = H5E_HEAP_g = H5E_OHDR_g = H5E_ATOM_g = H5E_ATTR_g =
-            H5E_NONE_MAJOR_g = H5E_IO_g = H5E_SLIST_g = H5E_EFL_g = H5E_TST_g = H5E_ARGS_g = H5E_ERROR_g =
-                H5E_PLINE_g = H5E_FSPACE_g = H5E_CACHE_g = (-1);
+    
+H5E_ATTR_g=    
+H5E_ATOM_g=    
+H5E_DATASPACE_g=    
+H5E_SLIST_g=    
+H5E_OHDR_g=    
+H5E_EFL_g=    
+H5E_TST_g=    
+H5E_BTREE_g=    
+H5E_IO_g=    
+H5E_VFL_g=    
+H5E_NONE_MAJOR_g=    
+H5E_REFERENCE_g=    
+H5E_PLINE_g=    
+H5E_DATASET_g=    
+H5E_PLUGIN_g=    
+H5E_ARGS_g=    
+H5E_LINK_g=    
+H5E_SYM_g=    
+H5E_HEAP_g=    
+H5E_ERROR_g=    
+H5E_FUNC_g=    
+H5E_PLIST_g=    
+H5E_SOHM_g=    
+H5E_FILE_g=    
+H5E_STORAGE_g=    
+H5E_DATATYPE_g=    
+H5E_FSPACE_g=    
+H5E_RESOURCE_g=    
+H5E_INTERNAL_g=    
+H5E_RS_g=    
+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_CANTALLOC_g = H5E_CANTCOPY_g = H5E_CANTFREE_g = H5E_ALREADYEXISTS_g = H5E_CANTLOCK_g =
-        H5E_CANTUNLOCK_g = H5E_CANTGC_g = H5E_CANTGETSIZE_g = H5E_OBJOPEN_g =
-
-            /* Heap errors */
-    H5E_CANTRESTORE_g = H5E_CANTCOMPUTE_g = H5E_CANTEXTEND_g = H5E_CANTATTACH_g = H5E_CANTUPDATE_g =
-        H5E_CANTOPERATE_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 = H5E_SETDISALLOWED_g =
-
-        /* Free space errors */
-    H5E_CANTMERGE_g = H5E_CANTREVIVE_g = H5E_CANTSHRINK_g =
-
-        /* Object header related errors */
-    H5E_LINKCOUNT_g = H5E_VERSION_g = H5E_ALIGNMENT_g = H5E_BADMESG_g = H5E_CANTDELETE_g = H5E_BADITER_g =
-        H5E_CANTPACK_g = H5E_CANTRESET_g = H5E_CANTRENAME_g =
-
-            /* System level errors */
-    H5E_SYSERRSTR_g =
-
-        /* I/O pipeline errors */
-    H5E_NOFILTER_g = H5E_CALLBACK_g = H5E_CANAPPLY_g = H5E_SETLOCAL_g = H5E_NOENCODER_g = H5E_CANTFILTER_g =
-
-        /* Group related errors */
-    H5E_CANTOPENOBJ_g = H5E_CANTCLOSEOBJ_g = H5E_COMPLEN_g = H5E_PATH_g =
-
-        /* No error */
-    H5E_NONE_MINOR_g =
-
-        /* Plugin errors */
-    H5E_OPENERROR_g =
-
-        /* File accessibilty errors */
-    H5E_FILEEXISTS_g = H5E_FILEOPEN_g = H5E_CANTCREATE_g = H5E_CANTOPENFILE_g = H5E_CANTCLOSEFILE_g =
-        H5E_NOTHDF5_g = 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 = H5E_CANTLOAD_g = H5E_PROTECT_g = H5E_NOTCACHED_g = H5E_SYSTEM_g =
-        H5E_CANTINS_g = H5E_CANTPROTECT_g = H5E_CANTUNPROTECT_g = H5E_CANTPIN_g = H5E_CANTUNPIN_g =
-            H5E_CANTMARKDIRTY_g = H5E_CANTDIRTY_g = H5E_CANTEXPUNGE_g = H5E_CANTRESIZE_g =
-
-                /* Link related errors */
-    H5E_TRAVERSE_g = H5E_NLINKS_g = H5E_NOTREGISTERED_g = H5E_CANTMOVE_g = H5E_CANTSORT_g =
-
-        /* Parallel MPI errors */
-    H5E_MPI_g = H5E_MPIERRSTR_g = H5E_CANTRECV_g =
-
-        /* Dataspace errors */
-    H5E_CANTCLIP_g = H5E_CANTCOUNT_g = H5E_CANTSELECT_g = H5E_CANTNEXT_g = H5E_BADSELECT_g =
-        H5E_CANTCOMPARE_g =
-
-            /* Argument errors */
-    H5E_UNINITIALIZED_g = H5E_UNSUPPORTED_g = H5E_BADTYPE_g = H5E_BADRANGE_g = H5E_BADVALUE_g =
-
-        /* B-tree related errors */
-    H5E_NOTFOUND_g = H5E_EXISTS_g = H5E_CANTENCODE_g = H5E_CANTDECODE_g = H5E_CANTSPLIT_g =
-        H5E_CANTREDISTRIBUTE_g = H5E_CANTSWAP_g = H5E_CANTINSERT_g = H5E_CANTLIST_g = H5E_CANTMODIFY_g =
-            H5E_CANTREMOVE_g =
 
-                /* Datatype conversion errors */
-    H5E_CANTCONVERT_g = H5E_BADSIZE_g = (-1);
+/* 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=
+
+/* Heap errors */    
+H5E_CANTRESTORE_g=    
+H5E_CANTCOMPUTE_g=    
+H5E_CANTEXTEND_g=    
+H5E_CANTATTACH_g=    
+H5E_CANTUPDATE_g=    
+H5E_CANTOPERATE_g=
+
+/* Free space errors */    
+H5E_CANTMERGE_g=    
+H5E_CANTREVIVE_g=    
+H5E_CANTSHRINK_g=
+
+/* Resource errors */    
+H5E_NOSPACE_g=    
+H5E_CANTALLOC_g=    
+H5E_CANTCOPY_g=    
+H5E_CANTFREE_g=    
+H5E_ALREADYEXISTS_g=    
+H5E_CANTLOCK_g=    
+H5E_CANTUNLOCK_g=    
+H5E_CANTGC_g=    
+H5E_CANTGETSIZE_g=    
+H5E_OBJOPEN_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=
+
+/* System level errors */    
+H5E_SYSERRSTR_g=
+
+/* Parallel MPI errors */    
+H5E_MPI_g=    
+H5E_MPIERRSTR_g=    
+H5E_CANTRECV_g=
+
+/* Dataspace errors */    
+H5E_CANTCLIP_g=    
+H5E_CANTCOUNT_g=    
+H5E_CANTSELECT_g=    
+H5E_CANTNEXT_g=    
+H5E_BADSELECT_g=    
+H5E_CANTCOMPARE_g=
+
+/* Cache related errors */    
+H5E_CANTFLUSH_g=    
+H5E_CANTSERIALIZE_g=    
+H5E_CANTLOAD_g=    
+H5E_PROTECT_g=    
+H5E_NOTCACHED_g=    
+H5E_SYSTEM_g=    
+H5E_CANTINS_g=    
+H5E_CANTPROTECT_g=    
+H5E_CANTUNPROTECT_g=    
+H5E_CANTPIN_g=    
+H5E_CANTUNPIN_g=    
+H5E_CANTMARKDIRTY_g=    
+H5E_CANTDIRTY_g=    
+H5E_CANTEXPUNGE_g=    
+H5E_CANTRESIZE_g=
+
+/* Plugin errors */    
+H5E_OPENERROR_g=
+
+/* I/O pipeline errors */    
+H5E_NOFILTER_g=    
+H5E_CALLBACK_g=    
+H5E_CANAPPLY_g=    
+H5E_SETLOCAL_g=    
+H5E_NOENCODER_g=    
+H5E_CANTFILTER_g=
+
+/* Object header related errors */    
+H5E_LINKCOUNT_g=    
+H5E_VERSION_g=    
+H5E_ALIGNMENT_g=    
+H5E_BADMESG_g=    
+H5E_CANTDELETE_g=    
+H5E_BADITER_g=    
+H5E_CANTPACK_g=    
+H5E_CANTRESET_g=    
+H5E_CANTRENAME_g=
+
+/* Group related errors */    
+H5E_CANTOPENOBJ_g=    
+H5E_CANTCLOSEOBJ_g=    
+H5E_COMPLEN_g=    
+H5E_PATH_g=
+
+/* File accessibilty errors */    
+H5E_FILEEXISTS_g=    
+H5E_FILEOPEN_g=    
+H5E_CANTCREATE_g=    
+H5E_CANTOPENFILE_g=    
+H5E_CANTCLOSEFILE_g=    
+H5E_NOTHDF5_g=    
+H5E_BADFILE_g=    
+H5E_TRUNCATED_g=    
+H5E_MOUNT_g=
+
+/* Property list errors */    
+H5E_CANTGET_g=    
+H5E_CANTSET_g=    
+H5E_DUPCLASS_g=    
+H5E_SETDISALLOWED_g=
+
+/* Link related errors */    
+H5E_TRAVERSE_g=    
+H5E_NLINKS_g=    
+H5E_NOTREGISTERED_g=    
+H5E_CANTMOVE_g=    
+H5E_CANTSORT_g=
+
+/* Object atom related errors */    
+H5E_BADATOM_g=    
+H5E_BADGROUP_g=    
+H5E_CANTREGISTER_g=    
+H5E_CANTINC_g=    
+H5E_CANTDEC_g=    
+H5E_NOIDS_g=
+
+/* Function entry/exit interface errors */    
+H5E_CANTINIT_g=    
+H5E_ALREADYINIT_g=    
+H5E_CANTRELEASE_g=
+
+/* No error */    
+H5E_NONE_MINOR_g=
+
+/* B-tree related errors */    
+H5E_NOTFOUND_g=    
+H5E_EXISTS_g=    
+H5E_CANTENCODE_g=    
+H5E_CANTDECODE_g=    
+H5E_CANTSPLIT_g=    
+H5E_CANTREDISTRIBUTE_g=    
+H5E_CANTSWAP_g=    
+H5E_CANTINSERT_g=    
+H5E_CANTLIST_g=    
+H5E_CANTMODIFY_g=    
+H5E_CANTREMOVE_g= (-1);
 
 #endif /* H5Eterm_H */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 0cec769..0896620 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -195,9 +195,6 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
     haddr_t             a_addr          = 0;
     hbool_t             create_new_node = TRUE;
     herr_t              ret_value       = SUCCEED;
-#ifdef DER
-    hbool_t was_adjusted = FALSE;
-#endif
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -205,34 +202,15 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
     HDassert(file->dirty_list);
     HDassert(start <= end);
 
-#ifdef DER
-    HDfprintf(stderr, "Add region: (%llu, %llu)\n", start, end);
-#endif
-
     /* Adjust the dirty region to the nearest block boundaries */
-    if (start % file->bstore_page_size != 0) {
+    if (start % file->bstore_page_size != 0)
         start = (start / file->bstore_page_size) * file->bstore_page_size;
-#ifdef DER
-        was_adjusted = TRUE;
-#endif
-    }
+
     if (end % file->bstore_page_size != (file->bstore_page_size - 1)) {
         end = (((end / file->bstore_page_size) + 1) * file->bstore_page_size) - 1;
-        if (end > file->eof) {
-#ifdef DER
-            HDfprintf(stderr, "Adjusted to EOF\n");
-#endif
+        if (end > file->eof)
             end = file->eof - 1;
-        }
-#ifdef DER
-        was_adjusted = TRUE;
-#endif
-    }
-
-#ifdef DER
-    if (was_adjusted)
-        HDfprintf(stderr, "Adjusted region: (%llu, %llu)\n", start, end);
-#endif
+    } /* end if */
 
     /* Get the regions before and after the intended insertion point */
     b_addr = start + 1;
@@ -241,15 +219,13 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
     a_item = (H5FD_core_region_t *)H5SL_less(file->dirty_list, &a_addr);
 
     /* Check to see if we need to extend the upper end of the NEW region */
-    if (a_item) {
+    if (a_item)
         if (start < a_item->start && end < a_item->end) {
-
             /* Extend the end of the NEW region to match the existing AFTER region */
             end = a_item->end;
-        }
-    }
+        } /* end if */
     /* Attempt to extend the PREV region */
-    if (b_item) {
+    if (b_item)
         if (start <= b_item->end + 1) {
 
             /* Need to set this for the delete algorithm */
@@ -260,7 +236,6 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
              */
             create_new_node = FALSE;
         }
-    }
 
     /* Remove any old nodes that are no longer needed */
     while (a_item && a_item->start > start) {
@@ -278,7 +253,7 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
         /* Set up to check the next node */
         if (less)
             a_item = less;
-    }
+    } /* end while */
 
     /* Insert the new node */
     if (create_new_node) {
@@ -304,7 +279,7 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_core_add_dirty_region() */
+} /* end H5FD__core_add_dirty_region() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_destroy_dirty_list
@@ -328,20 +303,13 @@ H5FD_core_destroy_dirty_list(H5FD_core_t *file)
     if (file->dirty_list) {
         H5FD_core_region_t *region = NULL;
 
-#ifdef DER
-        {
-            size_t count = H5SL_count(file->dirty_list);
-            if (count != 0)
-                HDfprintf(stderr, "LIST NOT EMPTY AT DESTROY\n");
-        }
-#endif
         while (NULL != (region = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list)))
             region = H5FL_FREE(H5FD_core_region_t, region);
 
         if (H5SL_close(file->dirty_list) < 0)
             HGOTO_ERROR(H5E_SLIST, H5E_CLOSEERROR, FAIL, "can't close core vfd dirty list")
         file->dirty_list = NULL;
-    }
+    } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -385,14 +353,8 @@ H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size)
         else
             bytes_in = (h5_posix_io_t)size;
 
-#ifdef DER
-        HDfprintf(stderr, "\nNEW\n");
-#endif
         do {
             bytes_wrote = HDwrite(file->fd, ptr, bytes_in);
-#ifdef DER
-            HDfprintf(stderr, "bytes wrote: %lu\n", bytes_wrote);
-#endif
         } while (-1 == bytes_wrote && EINTR == errno);
 
         if (-1 == bytes_wrote) { /* error */
@@ -419,7 +381,6 @@ H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5FD_core_write_to_bstore() */
 
 /*-------------------------------------------------------------------------
@@ -427,8 +388,7 @@ done:
  *
  * Purpose:     Initializes any interface-specific data or routines.
  *
- * Return:      Success:    The driver ID for the core driver.
- *              Failure:    Negative.
+ * Return:      Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -446,8 +406,8 @@ H5FD_core_init_interface(void)
  * Purpose:     Initialize this driver by registering the driver with the
  *              library.
  *
- * Return:      Success:    The driver ID for the core driver.
- *              Failure:    Negative.
+ * Return:      Success:    The driver ID for the core driver
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
@@ -457,9 +417,9 @@ H5FD_core_init_interface(void)
 hid_t
 H5FD_core_init(void)
 {
-    hid_t ret_value = H5FD_CORE_g; /* Return value */
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     if (H5I_VFL != H5I_get_type(H5FD_CORE_g))
         H5FD_CORE_g = H5FD_register(&H5FD_core_g, sizeof(H5FD_class_t), FALSE);
@@ -469,7 +429,7 @@ H5FD_core_init(void)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_core_init() */
 
 /*---------------------------------------------------------------------------
  * Function:    H5FD_core_term
@@ -529,7 +489,7 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store)
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Pset_fapl_core() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fapl_core
@@ -546,9 +506,9 @@ done:
 herr_t
 H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_store /*out*/)
 {
-    H5FD_core_fapl_t *fa;
-    H5P_genplist_t *  plist;               /* Property list pointer */
-    herr_t            ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *        plist; /* Property list pointer */
+    const H5FD_core_fapl_t *fa;
+    herr_t                  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, increment, backing_store);
@@ -567,7 +527,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_stor
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Pget_fapl_core() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD_core_fapl_get
@@ -575,7 +535,6 @@ done:
  * Purpose:     Returns a copy of the file access properties.
  *
  * Return:      Success:    Ptr to new file access properties.
- *
  *              Failure:    NULL
  *
  * Programmer:  Robb Matzke
@@ -588,7 +547,7 @@ H5FD_core_fapl_get(H5FD_t *_file)
 {
     H5FD_core_t *     file = (H5FD_core_t *)_file;
     H5FD_core_fapl_t *fa;
-    void *            ret_value; /* Return value */
+    void *            ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -613,7 +572,6 @@ done:
  * Return:      Success:    A pointer to a new file data structure. The
  *                          public fields will be initialized by the
  *                          caller, which is always H5FD_open().
- *
  *              Failure:    NULL
  *
  * Programmer:  Robb Matzke
@@ -624,17 +582,17 @@ done:
 static H5FD_t *
 H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    int               o_flags;
-    H5FD_core_t *     file = NULL;
-    H5FD_core_fapl_t *fa   = NULL;
-    H5P_genplist_t *  plist; /* Property list pointer */
+    int                     o_flags;
+    H5FD_core_t *           file = NULL;
+    const H5FD_core_fapl_t *fa   = NULL;
+    H5P_genplist_t *        plist; /* Property list pointer */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
     h5_stat_t              sb;
     int                    fd = -1;
     H5FD_file_image_info_t file_image_info;
-    H5FD_t *               ret_value;
+    H5FD_t *               ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -844,9 +802,6 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
         if (use_write_tracking) {
             if (NULL == (file->dirty_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
                 HGOTO_ERROR(H5E_SLIST, H5E_CANTCREATE, NULL, "can't create core vfd dirty region list");
-#ifdef DER
-            HDfprintf(stderr, "\n");
-#endif
         } /* end if */
     }     /* end if */
 
@@ -925,7 +880,6 @@ done:
  *              address.
  *
  * Return:      Success:    A value like strcmp()
- *
  *              Failure:    never fails (arguments were checked by the
  *                          caller).
  *
@@ -1030,12 +984,12 @@ H5FD_core_query(const H5FD_t *_file, unsigned long *flags /* out */)
     /* Set the VFL feature flags that this driver supports */
     if(flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */
-        *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
-        *flags |= H5FD_FEAT_DATA_SIEVE;       /* OK to perform data sieving for faster raw data reads & writes */
-        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
-        *flags |= H5FD_FEAT_ALLOW_FILE_IMAGE;   /* OK to use file image feature with this VFD */
-        *flags |= H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS;       /* OK to use file image callbacks with this VFD */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;             /* OK to aggregate metadata allocations                             */
+        *flags |= H5FD_FEAT_ACCUMULATE_METADATA;            /* OK to accumulate metadata for faster writes                      */
+        *flags |= H5FD_FEAT_DATA_SIEVE;                     /* OK to perform data sieving for faster raw data reads & writes    */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA;            /* OK to aggregate "small" raw data allocations                     */
+        *flags |= H5FD_FEAT_ALLOW_FILE_IMAGE;               /* OK to use file image feature with this VFD                       */
+        *flags |= H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS;   /* OK to use file image callbacks with this VFD                     */
 
         /* If the backing store is open, a POSIX file handle is available */
         if(file && file->fd >= 0 && file->backing_store)
@@ -1195,7 +1149,6 @@ done:
  *
  * Return:      Success:    SUCCEED. Result is stored in caller-supplied
  *                          buffer BUF.
- *
  *              Failure:    FAIL, Contents of buffer BUF are undefined.
  *
  * Programmer:  Robb Matzke
@@ -1365,9 +1318,6 @@ H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UN
             H5FD_core_region_t *item = NULL;
             size_t              size;
 
-#ifdef DER
-            HDfprintf(stderr, "FLUSHING. DIRTY LIST:\n");
-#endif
             while (NULL != (item = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list))) {
 
                 /* The file may have been truncated, so check for that
@@ -1376,10 +1326,8 @@ H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UN
                 if (item->start < file->eof) {
                     if (item->end >= file->eof)
                         item->end = file->eof - 1;
+
                     size = (size_t)((item->end - item->start) + 1);
-#ifdef DER
-                    HDfprintf(stderr, "(%llu, %llu : %lu)\n", item->start, item->end, size);
-#endif
                     if (H5FD_core_write_to_bstore(file, item->start, size) != SUCCEED)
                         HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "unable to write to backing store")
                 } /* end if */
@@ -1387,21 +1335,12 @@ H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UN
                 item = H5FL_FREE(H5FD_core_region_t, item);
             } /* end while */
 
-#ifdef DER
-            HDfprintf(stderr, "EOF: %llu\n", file->eof);
-            HDfprintf(stderr, "EOA: %llu\n", file->eoa);
-            if (file->eoa > file->eof)
-                HDfprintf(stderr, "*** EOA BADNESS ***\n");
-            HDfprintf(stderr, "\n");
-#endif
-        }
+        } /* end if */
         /* Otherwise, write the entire file out at once */
-        else {
+        else
             if (H5FD_core_write_to_bstore(file, (haddr_t)0, (size_t)file->eof) != SUCCEED)
                 HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "unable to write to backing store")
 
-        } /* end while */
-
         file->dirty = FALSE;
     }
 
@@ -1522,9 +1461,6 @@ H5FD_core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
                     HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
 #endif /* H5_HAVE_WIN32_API */
 
-#ifdef DER
-                HDfprintf(stderr, "OLD: Truncated to: %llu\n", file->eoa);
-#endif
             } /* end if */
 
             /* Update the eof value */
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index 104ac27..bd532be 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -95,6 +95,7 @@ typedef struct H5FD_direct_t {
     DWORD fileindexlo;
     DWORD fileindexhi;
 #endif
+
 } H5FD_direct_t;
 
 /*
@@ -194,28 +195,25 @@ H5FD_direct_init_interface(void)
 } /* H5FD_direct_init_interface() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_direct_init
- *
- * Purpose:  Initialize this driver by registering the driver with the
- *    library.
+ * Function:    H5FD_direct_init
  *
- * Return:  Success:  The driver ID for the direct driver.
+ * Purpose:     Initialize this driver by registering the driver with the
+ *              library.
  *
- *    Failure:  Negative.
+ * Return:      Success:    The driver ID for the direct driver
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hid_t
 H5FD_direct_init(void)
 {
-    hid_t ret_value; /* Return value */
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     if (H5I_VFL != H5I_get_type(H5FD_DIRECT_g))
         H5FD_DIRECT_g = H5FD_register(&H5FD_direct_g, sizeof(H5FD_class_t), FALSE);
@@ -225,7 +223,7 @@ H5FD_direct_init(void)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_direct_init() */
 
 /*---------------------------------------------------------------------------
  * Function:  H5FD_direct_term
@@ -237,8 +235,6 @@ done:
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modification:
- *
  *---------------------------------------------------------------------------
  */
 void
@@ -264,8 +260,6 @@ H5FD_direct_term(void)
  * Programmer:  Raymond Lu
  *    Wednesday, 20 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -281,6 +275,7 @@ H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbu
     if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
+    HDmemset(&fa, 0, sizeof(H5FD_direct_fapl_t));
     if (boundary != 0)
         fa.mboundary = boundary;
     else
@@ -320,17 +315,15 @@ done:
  * Programmer:  Raymond Lu
  *              Wednesday, October 18, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary /*out*/, size_t *block_size /*out*/,
                    size_t *cbuf_size /*out*/)
 {
-    H5FD_direct_fapl_t *fa;
-    H5P_genplist_t *    plist;               /* Property list pointer */
-    herr_t              ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *          plist; /* Property list pointer */
+    const H5FD_direct_fapl_t *fa;
+    herr_t                    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ixxx", fapl_id, boundary, block_size, cbuf_size);
@@ -350,7 +343,7 @@ H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary /*out*/, size_t *block_size /
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Pget_fapl_direct() */
 
 /*-------------------------------------------------------------------------
  * Function:  H5FD_direct_fapl_get
@@ -367,8 +360,6 @@ done:
  * Programmer:  Raymond Lu
  *              Wednesday, 18 October 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void *
@@ -398,8 +389,6 @@ done:
  * Programmer:  Raymond Lu
  *              Wednesday, 18 October 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void *
@@ -432,8 +421,6 @@ H5FD_direct_fapl_copy(const void *_old_fa)
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
@@ -449,8 +436,8 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
 #endif
     h5_stat_t       sb;
     H5P_genplist_t *plist; /* Property list */
-    int *           buf1, *buf2;
-    H5FD_t *        ret_value;
+    void *          buf1, *buf2;
+    H5FD_t *        ret_value = NULL;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -581,8 +568,6 @@ done:
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -616,8 +601,6 @@ done:
  * Programmer:  Raymond Lu
  *              Thursday, 21 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -681,8 +664,6 @@ done:
  * Programmer:  Raymond Lu
  *              Thursday, 21 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -716,11 +697,6 @@ H5FD_direct_query(const H5FD_t H5_ATTR_UNUSED *_f, unsigned long *flags /* out *
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -747,11 +723,6 @@ H5FD_direct_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -782,8 +753,6 @@ H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
  * Programmer:  Raymond Lu
  *              Wednesday, 20 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -806,8 +775,6 @@ H5FD_direct_get_eof(const H5FD_t *_file)
  * Programmer:     Raymond Lu
  *                 21 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -841,8 +808,6 @@ done:
  * Programmer:  Raymond Lu
  *              Thursday, 21 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -985,6 +950,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
         addr = (haddr_t)(((addr + size - 1) / _fbsize + 1) * _fbsize);
 
         if (copy_buf) {
+            /* Free with HDfree since it came from posix_memalign */
             HDfree(copy_buf);
             copy_buf = NULL;
         } /* end if */
@@ -996,6 +962,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
 
 done:
     if (ret_value < 0) {
+        /* Free with HDfree since it came from posix_memalign */
         if (copy_buf)
             HDfree(copy_buf);
 
@@ -1021,8 +988,6 @@ done:
  * Programmer:  Raymond Lu
  *              Thursday, 21 September 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1212,6 +1177,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U
         buf  = (const char *)buf + size;
 
         if (copy_buf) {
+            /* Free with HDfree since it came from posix_memalign */
             HDfree(copy_buf);
             copy_buf = NULL;
         } /* end if */
@@ -1225,6 +1191,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U
 
 done:
     if (ret_value < 0) {
+        /* Free with HDfree since it came from posix_memalign */
         if (copy_buf)
             HDfree(copy_buf);
 
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 4c85a5b..8f02269 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -160,26 +160,23 @@ H5FD_family_init_interface(void)
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_init
  *
- * Purpose:    Initialize this driver by registering the driver with the
- *        library.
+ * Purpose:     Initialize this driver by registering the driver with the
+ *              library.
  *
- * Return:    Success:    The driver ID for the family driver.
+ * Return:      Success:    The driver ID for the family driver
+ *              Failure:    H5I_INVALID_HID
  *
- *        Failure:    Negative
- *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hid_t
 H5FD_family_init(void)
 {
-    hid_t ret_value = H5FD_FAMILY_g; /* Return value */
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     if (H5I_VFL != H5I_get_type(H5FD_FAMILY_g))
         H5FD_FAMILY_g = H5FD_register(&H5FD_family_g, sizeof(H5FD_class_t), FALSE);
@@ -201,8 +198,6 @@ done:
  * Programmer:  Quincey Koziol
  *              Friday, Jan 30, 2004
  *
- * Modification:
- *
  *---------------------------------------------------------------------------
  */
 void
@@ -227,18 +222,11 @@ H5FD_family_term(void)
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
- *        Raymond Lu
- *         Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -278,30 +266,23 @@ done:
  * Function:    H5Pget_fapl_family
  *
  * Purpose:    Returns information about the family file access property
- *        list though the function arguments.
+ *             list though the function arguments.
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
- *        Raymond Lu
- *         Tuesday, Oct 23, 2001
- *        Changed the file access list to the new generic property
- *        list.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize /*out*/, hid_t *memb_fapl_id /*out*/)
 {
-    H5FD_family_fapl_t *fa;
-    H5P_genplist_t *    plist;               /* Property list pointer */
-    herr_t              ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *          plist; /* Property list pointer */
+    const H5FD_family_fapl_t *fa;
+    herr_t                    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, msize, memb_fapl_id);
@@ -332,13 +313,11 @@ done:
  *
  * Return:    Success:    Ptr to new file access property list.
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void *
@@ -346,8 +325,8 @@ H5FD_family_fapl_get(H5FD_t *_file)
 {
     H5FD_family_t *     file = (H5FD_family_t *)_file;
     H5FD_family_fapl_t *fa   = NULL;
-    H5P_genplist_t *    plist;     /* Property list pointer */
-    void *              ret_value; /* Return value */
+    H5P_genplist_t *    plist;            /* Property list pointer */
+    void *              ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -363,10 +342,10 @@ H5FD_family_fapl_get(H5FD_t *_file)
     ret_value = fa;
 
 done:
-    if (ret_value == NULL) {
+    if (ret_value == NULL)
         if (fa != NULL)
             H5MM_xfree(fa);
-    } /* end if */
+
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
@@ -377,13 +356,11 @@ done:
  *
  * Return:    Success:    Ptr to a new property list
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void *
@@ -391,8 +368,8 @@ H5FD_family_fapl_copy(const void *_old_fa)
 {
     const H5FD_family_fapl_t *old_fa = (const H5FD_family_fapl_t *)_old_fa;
     H5FD_family_fapl_t *      new_fa = NULL;
-    H5P_genplist_t *          plist;     /* Property list pointer */
-    void *                    ret_value; /* Return value */
+    H5P_genplist_t *          plist;            /* Property list pointer */
+    void *                    ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -417,10 +394,10 @@ H5FD_family_fapl_copy(const void *_old_fa)
     ret_value = new_fa;
 
 done:
-    if (ret_value == NULL) {
+    if (ret_value == NULL)
         if (new_fa != NULL)
             H5MM_xfree(new_fa);
-    } /* end if */
+
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
@@ -431,13 +408,11 @@ done:
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -464,13 +439,11 @@ done:
  *
  * Return:    Success:    The super block driver data size.
  *
- *        Failure:    never fails
+ *            Failure:    never fails
  *
  * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static hsize_t
@@ -494,13 +467,11 @@ H5FD_family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -530,7 +501,7 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*ou
 /*-------------------------------------------------------------------------
  * Function:    H5FD_family_sb_decode
  *
- * Purpose:    This function has 2 separate purpose.  One is to decodes the
+ * Purpose:     This function has 2 separate purpose.  One is to decodes the
  *              superblock information for this driver. The NAME argument is
  *              the eight-character (plus null termination) name stored in i
  *              the file.  The FILE argument is updated according to the
@@ -538,7 +509,7 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*ou
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
@@ -561,28 +532,23 @@ H5FD_family_sb_decode(H5FD_t *_file, const char H5_ATTR_UNUSED *name, const unsi
      * h5repart is being used to change member file size.  h5repart will open
      * files for read and write.  When the files are closed, metadata will be
      * flushed to the files and updated to this new size */
-    if (file->mem_newsize) {
+    if (file->mem_newsize)
         file->memb_size = file->pmem_size = file->mem_newsize;
-        HGOTO_DONE(ret_value)
-    } /* end if */
-
-    /* Default - use the saved member size */
-    if (file->pmem_size == H5F_FAMILY_DEFAULT)
-        file->pmem_size = msize;
-
-    /* Check if member size from file access property is correct */
-    if (msize != file->pmem_size) {
-        char err_msg[128];
-
-        HDsnprintf(err_msg, sizeof(err_msg),
-                   "Family member size should be %lu.  But the size from file access property is %lu",
-                   (unsigned long)msize, (unsigned long)file->pmem_size);
-        HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, err_msg)
-    } /* end if */
-
-    /* Update member file size to the size saved in the superblock.
-     * That's the size intended to be. */
-    file->memb_size = msize;
+    else {
+        /* Default - use the saved member size */
+        if (file->pmem_size == H5F_FAMILY_DEFAULT)
+            file->pmem_size = msize;
+
+        /* Check if member size from file access property is correct */
+        if (msize != file->pmem_size)
+            HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL,
+                        "Family member size should be %lu.  But the size from file access property is %lu",
+                        (unsigned long)msize, (unsigned long)file->pmem_size)
+
+        /* Update member file size to the size saved in the superblock.
+         * That's the size intended to be. */
+        file->memb_size = msize;
+    } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -597,28 +563,11 @@ done:
  *                public fields will be initialized by the
  *                caller, which is always H5FD_open().
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              Thursday, November 18, 2004
- *              When file is re-opened, member size passed in from access property
- *              is checked to see if it's reasonable.  If there is only 1 member
- *              file, member size can't be smaller than current member size.
- *              If there are at least 2 member files, member size can only be equal
- *              the 1st member size.
- *
- *              Raymond Lu
- *              Tuesday, May 24, 2005
- *              The modification described above has been changed.  The major checking
- *              is done in H5F_read_superblock.  Member file size is saved in the
- *              superblock now.  H5F_read_superblock() reads this saved size and compare
- *              to the size passed in from file access property.  Wrong size will
- *              result in a failure.
- *
  *-------------------------------------------------------------------------
  */
 /* Disable warning for "format not a string literal" here -QAK */
@@ -657,8 +606,8 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
         file->mem_newsize = 0;                  /*New member size used by h5repart only       */
     }                                           /* end if */
     else {
-        H5P_genplist_t *    plist; /* Property list pointer */
-        H5FD_family_fapl_t *fa;
+        H5P_genplist_t *          plist; /* Property list pointer */
+        const H5FD_family_fapl_t *fa;
 
         if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
@@ -736,7 +685,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
         file->nmembs++;
     }
 
-    /* If the file is reopened and there's only one member file existing, this file maybe
+    /* If the file is reopened and there's only one member file existing, this file may be
      * smaller than the size specified through H5Pset_fapl_family().  Update the actual
      * member size.
      */
@@ -780,7 +729,7 @@ H5_GCC_DIAG_ON("format-nonliteral")
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative with as many members closed as
+ *            Failure:    Negative with as many members closed as
  *                possible. The only subsequent operation
  *                permitted on the file is a close operation.
  *
@@ -832,14 +781,12 @@ H5FD_family_close(H5FD_t *_file)
  *
  * Return:    Success:    like strcmp()
  *
- *        Failure:    never fails (arguments were checked by the
+ *            Failure:    never fails (arguments were checked by the
  *                caller).
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -851,8 +798,8 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    assert(f1->nmembs >= 1 && f1->memb[0]);
-    assert(f2->nmembs >= 1 && f2->memb[0]);
+    HDassert(f1->nmembs >= 1 && f1->memb[0]);
+    HDassert(f2->nmembs >= 1 && f2->memb[0]);
 
     ret_value = H5FDcmp(f1->memb[0], f2->memb[0]);
 
@@ -867,14 +814,13 @@ done:
  *              (listed in H5FDpublic.h)
  *
  * Return:    Success:    non-negative
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 25, 2000
  *
  *-------------------------------------------------------------------------
  */
-/* ARGSUSED */
 static herr_t
 H5FD_family_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
@@ -908,16 +854,11 @@ H5FD_family_query(const H5FD_t *_file, unsigned long *flags /* out */)
  *
  * Return:    Success:    The end-of-address-marker
  *
- *        Failure:    HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -937,16 +878,11 @@ H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *
  *-------------------------------------------------------------------------
  */
 /* Disable warning for "format not a string literal" here -QAK */
@@ -1028,13 +964,11 @@ H5_GCC_DIAG_ON("format-nonliteral")
  *                the end of the family of files or the current
  *                EOA, whichever is larger.
  *
- *        Failure:          HADDR_UNDEF
+ *            Failure:          HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -1042,8 +976,8 @@ H5FD_family_get_eof(const H5FD_t *_file)
 {
     const H5FD_family_t *file = (const H5FD_family_t *)_file;
     haddr_t              eof  = 0;
-    int                  i;         /* Local index variable */
-    haddr_t              ret_value; /* Return value */
+    int                  i;                       /* Local index variable */
+    haddr_t              ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -1085,8 +1019,6 @@ H5FD_family_get_eof(const H5FD_t *_file)
  * Programmer:     Raymond Lu
  *                 Sept. 16, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1096,7 +1028,7 @@ H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
     H5P_genplist_t *plist;
     hsize_t         offset;
     int             memb;
-    herr_t          ret_value;
+    herr_t          ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1126,13 +1058,11 @@ done:
  * Return:    Success:    Zero. Result is stored in caller-supplied
  *                buffer BUF.
  *
- *        Failure:    -1, contents of buffer BUF are undefined.
+ *            Failure:    -1, contents of buffer BUF are undefined.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1193,13 +1123,11 @@ done:
  *
  * Return:    Success:    Zero
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1257,7 +1185,7 @@ done:
  * Purpose:    Flushes all family members.
  *
  * Return:    Success:    0
- *        Failure:    -1, as many files flushed as possible.
+ *            Failure:    -1, as many files flushed as possible.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1291,7 +1219,7 @@ done:
  *
  * Return:    Success:    0
  *
- *        Failure:    -1, as many files truncated as possible.
+ *            Failure:    -1, as many files truncated as possible.
  *
  * Programmer:    Quincey Koziol
  *              Saturday, February 23, 2008
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index 02981d5..d6e8991 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -244,8 +244,7 @@ typedef struct {
  *
  * Programmer: Jacob Smith
  *
- ***************************************************************************
- */
+ ***************************************************************************/
 typedef struct H5FD_hdfs_t {
     H5FD_t           pub;
     H5FD_hdfs_fapl_t fa;
@@ -289,6 +288,7 @@ static herr_t  H5FD_hdfs_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, ha
 static herr_t  H5FD_hdfs_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 static herr_t  H5FD_hdfs_lock(H5FD_t *_file, hbool_t rw);
 static herr_t  H5FD_hdfs_unlock(H5FD_t *_file);
+
 static herr_t  H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t *fa);
 
 static const H5FD_class_t H5FD_hdfs_g = {
@@ -336,6 +336,8 @@ H5FL_DEFINE_STATIC(H5FD_hdfs_t);
  * Return:      Success:    The driver ID for the hdfs driver.
  *              Failure:    Negative
  *
+ * Programmer:  Jacob Smith 2018
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -362,10 +364,10 @@ H5FD_hdfs_init_interface(void)
 hid_t
 H5FD_hdfs_init(void)
 {
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 #if HDFS_STATS
     unsigned int bin_i;
 #endif
-    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
@@ -387,6 +389,7 @@ H5FD_hdfs_init(void)
     }
 #endif
 
+    /* Set return value */
     ret_value = H5FD_HDFS_g;
 
 done:
@@ -665,9 +668,11 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out)
 
     if (fa_out == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL")
+
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
     if (plist == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
+
     if (H5FD_HDFS != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
 
@@ -713,13 +718,14 @@ H5FD_hdfs_fapl_get(H5FD_t *_file)
     /* Copy the fields of the structure */
     HDmemcpy(fa, &(file->fa), sizeof(H5FD_hdfs_fapl_t));
 
+    /* Set return value */
     ret_value = fa;
 
 done:
-    if (ret_value == NULL && fa != NULL)
-        H5MM_xfree(fa); /* clean up on error */
+    if (ret_value == NULL)
+        if (fa != NULL)
+            H5MM_xfree(fa);
 
-    FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD_hdfs_fapl_get() */
 
 /*-------------------------------------------------------------------------
@@ -753,8 +759,9 @@ H5FD_hdfs_fapl_copy(const void *_old_fa)
     ret_value = new_fa;
 
 done:
-    if (ret_value == NULL && new_fa != NULL)
-        H5MM_xfree(new_fa); /* clean up on error */
+    if (ret_value == NULL)
+        if (new_fa != NULL)
+            H5MM_xfree(new_fa);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD_hdfs_fapl_copy() */
@@ -816,11 +823,11 @@ hdfs_reset_stats(H5FD_hdfs_t *file)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if HDFS_DEBUG
-    HDprintf("hdfs_reset_stats() called\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     if (file == NULL)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file was null")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file was null");
 
     for (i = 0; i <= HDFS_STATS_BIN_COUNT; i++) {
         file->raw[i].bytes = 0;
@@ -836,7 +843,6 @@ hdfs_reset_stats(H5FD_hdfs_t *file)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
-
 } /* hdfs_reset_stats */
 #endif /* HDFS_STATS */
 
@@ -1178,11 +1184,13 @@ hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
                   br_val, br_suffix,  /* rawdata bytes    */
                   am_val, am_suffix,  /* metadata average */
                   ar_val, ar_suffix); /* rawdata average  */
+
         HDfflush(stream);
     }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
+
 } /* hdfs_fprint_stats */
 #endif /* HDFS_STATS */
 
@@ -1196,8 +1204,7 @@ done:
  *
  * Return:
  *
- *      Success:    SUCCEED
- *      Failure:    FAIL, file not closed.
+ *     SUCCEED/FAIL
  *
  * Programmer: Jacob Smith
  *             2017-11-02
@@ -1207,8 +1214,8 @@ done:
 static herr_t
 H5FD_hdfs_close(H5FD_t *_file)
 {
-    herr_t       ret_value = SUCCEED;
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1345,6 +1352,7 @@ H5FD_hdfs_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags) /* out
     HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
+    /* Set the VFL feature flags that this driver supports */
     if (flags) {
         *flags = 0;
         *flags |= H5FD_FEAT_DATA_SIEVE;
@@ -1456,7 +1464,7 @@ H5FD_hdfs_get_eof(const H5FD_t *_file)
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_hdfs_get_handle
+ * Function: H5FD_hdfs_get_handle()
  *
  * Purpose:
  *
@@ -1474,8 +1482,8 @@ H5FD_hdfs_get_eof(const H5FD_t *_file)
 static herr_t
 H5FD_hdfs_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    herr_t       ret_value = SUCCEED;
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1494,9 +1502,9 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_hdfs_read
+ * Function: H5FD_hdfs_read()
  *
- * Purpose:
+ * Purpose
  *
  *     Reads SIZE bytes of data from FILE beginning at address ADDR
  *     into buffer BUF according to data transfer properties in DXPL_ID.
@@ -1518,9 +1526,9 @@ static herr_t
 H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
                size_t size, void *buf)
 {
-    herr_t       ret_value = SUCCEED;
     H5FD_hdfs_t *file      = (H5FD_hdfs_t *)_file;
     size_t       filesize  = 0;
+    herr_t       ret_value = SUCCEED;
 #if HDFS_STATS
     /* working variables for storing stats */
     hdfs_statsbin *bin   = NULL;
@@ -1577,7 +1585,7 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_hdfs_write
+ * Function: H5FD_hdfs_write()
  *
  * Purpose:
  *
@@ -1673,6 +1681,7 @@ static herr_t
 H5FD_hdfs_lock(H5FD_t H5_ATTR_UNUSED *_file, hbool_t H5_ATTR_UNUSED rw)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
+
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_hdfs_lock() */
 
@@ -1698,6 +1707,7 @@ static herr_t
 H5FD_hdfs_unlock(H5FD_t H5_ATTR_UNUSED *_file)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
+
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD_hdfs_unlock() */
 
diff --git a/src/H5FDhdfs.h b/src/H5FDhdfs.h
index cd8a893..6692ed6 100644
--- a/src/H5FDhdfs.h
+++ b/src/H5FDhdfs.h
@@ -16,7 +16,7 @@
  * Programmer:  Jacob Smith
  *              2018-04-23
  *
- * Purpose:	The public header file for the hdfs driver.
+ * Purpose:    The public header file for the hdfs driver.
  */
 
 #ifndef H5FDhdfs_H
@@ -25,7 +25,7 @@
 #ifdef H5_HAVE_LIBHDFS
 #define H5FD_HDFS (H5FD_hdfs_init())
 #else /* H5_HAVE_LIBHDFS */
-#define H5FD_HDFS (-1)
+#define H5FD_HDFS (H5I_INVALID_HID)
 #endif /* H5_HAVE_LIBHDFS */
 
 /****************************************************************************
diff --git a/src/H5FDint.c b/src/H5FDint.c
index 7ae710e..9706a66 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -32,11 +32,11 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"  /* Generic Functions			*/
-#include "H5Eprivate.h" /* Error handling		  	*/
-#include "H5Fprivate.h" /* File access				*/
-#include "H5FDpkg.h"    /* File Drivers				*/
-#include "H5Iprivate.h" /* IDs			  		*/
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5Fprivate.h"  /* File access                              */
+#include "H5FDpkg.h"     /* File Drivers                             */
+#include "H5Iprivate.h"  /* IDs                                      */
 
 /****************/
 /* Local Macros */
@@ -94,20 +94,18 @@ H5FD_int_init_interface(void)
  *              signature can appear at address 0, or any power of two
  *              beginning with 512.
  *
- * Return:      Success:        SUCCEED
- *              Failure:        FAIL
- *
- * Programmer:  Robb Matzke
- *              Friday, November  7, 1997
+ * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_addr)
 {
-    haddr_t  addr, eoa;
+    haddr_t  addr = HADDR_UNDEF;
+    haddr_t  eoa  = HADDR_UNDEF;
     uint8_t  buf[H5F_SIGNATURE_LEN];
-    unsigned n, maxpow;
+    unsigned n;
+    unsigned maxpow;
     herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -120,8 +118,7 @@ H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_add
         addr >>= 1;
     maxpow = MAX(maxpow, 9);
 
-    /*
-     * Search for the file signature at format address zero followed by
+    /* Search for the file signature at format address zero followed by
      * powers of two larger than 9.
      */
     for (n = 8; n < maxpow; n++) {
@@ -132,7 +129,7 @@ H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_add
             HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to read file signature")
         if (!HDmemcmp(buf, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN))
             break;
-    } /* end for */
+    }
 
     /*
      * If the signature was not found then reset the EOA value and return
@@ -142,7 +139,7 @@ H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_add
         if (H5FD_set_eoa(file, H5FD_MEM_SUPER, eoa) < 0)
             HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to reset EOA value")
         *sig_addr = HADDR_UNDEF;
-    } /* end if */
+    }
     else
         /* Set return value */
         *sig_addr = addr;
@@ -152,15 +149,11 @@ done:
 } /* end H5FD_locate_signature() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_read
- *
- * Purpose:	Private version of H5FDread()
+ * Function:    H5FD_read
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Purpose:     Private version of H5FDread()
  *
- * Programmer:	Robb Matzke
- *              Wednesday, August  4, 1999
+ * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
@@ -178,9 +171,11 @@ H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t add
     HDassert(buf);
 
 #ifndef H5_HAVE_PARALLEL
-    /* Do not return early for Parallel mode since the I/O could be a */
-    /* collective transfer. */
-    /* The no-op case */
+    /* The no-op case
+     *
+     * Do not return early for Parallel mode since the I/O could be a
+     * collective transfer.
+     */
     if (0 == size)
         HGOTO_DONE(SUCCEED)
 #endif /* H5_HAVE_PARALLEL */
@@ -201,15 +196,11 @@ done:
 } /* end H5FD_read() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_write
- *
- * Purpose:	Private version of H5FDwrite()
+ * Function:    H5FD_write
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Purpose:     Private version of H5FDwrite()
  *
- * Programmer:	Robb Matzke
- *              Wednesday, August  4, 1999
+ * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
@@ -217,8 +208,8 @@ herr_t
 H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size,
            const void *buf)
 {
-    haddr_t eoa       = HADDR_UNDEF;
-    herr_t  ret_value = SUCCEED; /* Return value */
+    haddr_t eoa       = HADDR_UNDEF; /* EOA for file */
+    herr_t  ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -227,9 +218,11 @@ H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t ad
     HDassert(buf);
 
 #ifndef H5_HAVE_PARALLEL
-    /* Do not return early for Parallel mode since the I/O could be a */
-    /* collective transfer. */
-    /* The no-op case */
+    /* The no-op case
+     *
+     * Do not return early for Parallel mode since the I/O could be a
+     * collective transfer.
+     */
     if (0 == size)
         HGOTO_DONE(SUCCEED)
 #endif /* H5_HAVE_PARALLEL */
@@ -250,20 +243,16 @@ done:
 } /* end H5FD_write() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_set_eoa
+ * Function:    H5FD_set_eoa
  *
- * Purpose:	Private version of H5FDset_eoa()
+ * Purpose:     Private version of H5FDset_eoa()
  *
  *              This function expects the EOA is a RELATIVE address, i.e.
  *              relative to the base address.  This is NOT the same as the
  *              EOA stored in the superblock, which is an absolute
  *              address.  Object addresses are relative.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative, no side effect
- *
- * Programmer:	Robb Matzke
- *              Wednesday, August  4, 1999
+ * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
@@ -286,27 +275,25 @@ done:
 } /* end H5FD_set_eoa() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_get_eoa
+ * Function:    H5FD_get_eoa
  *
- * Purpose:	Private version of H5FDget_eoa()
+ * Purpose:     Private version of H5FDget_eoa()
  *
  *              This function returns the EOA as a RELATIVE address, i.e.
  *              relative to the base address.  This is NOT the same as the
  *              EOA stored in the superblock, which is an absolute
  *              address.  Object addresses are relative.
  *
- * Return:	Success:	First byte after allocated memory.
- *		Failure:	HADDR_UNDEF
+ * Return:      Success:    First byte after allocated memory
  *
- * Programmer:	Robb Matzke
- *              Wednesday, August  4, 1999
+ *              Failure:    HADDR_UNDEF
  *
  *-------------------------------------------------------------------------
  */
 haddr_t
 H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type)
 {
-    haddr_t ret_value;
+    haddr_t ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
@@ -324,30 +311,25 @@ done:
 } /* end H5FD_get_eoa() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_get_eof
+ * Function:    H5FD_get_eof
  *
- * Purpose:	Private version of H5FDget_eof()
+ * Purpose:     Private version of H5FDget_eof()
  *
  *              This function returns the EOF as a RELATIVE address, i.e.
  *              relative to the base address.  This will be different
  *              from  the end of the physical file if there is a user
  *              block.
  *
- * Return:	Success:	The EOF address.
- *
- *		Failure:	HADDR_UNDEF
- *
- * Programmer:	Robb Matzke
- *              Wednesday, August  4, 1999
+ * Return:      Success:    The EOF address.
  *
- * Modifications:
+ *              Failure:    HADDR_UNDEF
  *
  *-------------------------------------------------------------------------
  */
 haddr_t
 H5FD_get_eof(const H5FD_t *file)
 {
-    haddr_t ret_value;
+    haddr_t ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
@@ -357,7 +339,7 @@ H5FD_get_eof(const H5FD_t *file)
     if (file->cls->get_eof) {
         if (HADDR_UNDEF == (ret_value = (file->cls->get_eof)(file)))
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, HADDR_UNDEF, "driver get_eof request failed")
-    } /* end if */
+    }
     else
         ret_value = file->maxaddr;
 
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index beb08af..5a3082e 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -231,8 +231,8 @@ H5FD_log_init_interface(void)
  * Purpose:     Initialize this driver by registering the driver with the
  *              library.
  *
- * Return:      Success:    The driver ID for the log driver.
- *              Failure:    Negative.
+ * Return:      Success:    The driver ID for the log driver
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
@@ -242,9 +242,9 @@ H5FD_log_init_interface(void)
 hid_t
 H5FD_log_init(void)
 {
-    hid_t ret_value; /* Return value */
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     if (H5I_VFL != H5I_get_type(H5FD_LOG_g))
         H5FD_LOG_g = H5FD_register(&H5FD_log_g, sizeof(H5FD_class_t), FALSE);
@@ -338,8 +338,8 @@ done:
 static void *
 H5FD_log_fapl_get(H5FD_t *_file)
 {
-    H5FD_log_t *file = (H5FD_log_t *)_file;
-    void *      ret_value; /* Return value */
+    H5FD_log_t *file      = (H5FD_log_t *)_file;
+    void *      ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -444,11 +444,11 @@ H5FD_log_fapl_free(void *_fa)
 static H5FD_t *
 H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_log_t *     file = NULL;
-    H5P_genplist_t * plist;   /* Property list */
-    H5FD_log_fapl_t *fa;      /* File access property list information */
-    int              fd = -1; /* File descriptor */
-    int              o_flags; /* Flags for open() call */
+    H5FD_log_t *           file = NULL;
+    H5P_genplist_t *       plist;   /* Property list */
+    const H5FD_log_fapl_t *fa;      /* File access property list information */
+    int                    fd = -1; /* File descriptor */
+    int                    o_flags; /* Flags for open() call */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
@@ -910,7 +910,7 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hsi
 {
     H5FD_log_t *file = (H5FD_log_t *)_file;
     haddr_t     addr;
-    haddr_t     ret_value; /* Return value */
+    haddr_t     ret_value = HADDR_UNDEF; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -992,6 +992,7 @@ H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if (file->fa.flags != 0) {
+        /* Check for increasing file size */
         if (H5F_addr_gt(addr, file->eoa) && H5F_addr_gt(addr, 0)) {
             hsize_t size = addr - file->eoa;
 
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c
index 3215fd2..0cf561d 100644
--- a/src/H5FDmpi.c
+++ b/src/H5FDmpi.c
@@ -40,8 +40,6 @@
  * Programmer:	Quincey Koziol
  *              Friday, January 30, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -78,8 +76,6 @@ done:
  * Programmer:	Quincey Koziol
  *              Friday, January 30, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -115,8 +111,6 @@ done:
  * Programmer:	Quincey Koziol
  *              Friday, January 30, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 MPI_Comm
@@ -153,13 +147,6 @@ done:
  * Programmer:  Unknown
  *              January 30, 1998
  *
- * Modifications:
- * 		Robb Matzke, 1999-04-23
- *		An error is reported for address overflows. The ADDR output
- *		argument is optional.
- *
- * 		Robb Matzke, 1999-08-06
- *		Modified to work with the virtual file layer.
  *-------------------------------------------------------------------------
  */
 haddr_t
@@ -190,16 +177,6 @@ H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off)
  * Programmer:  Unknown
  *              January 30, 1998
  *
- * Modifications:
- * 		Robb Matzke, 1999-04-23
- *		An error is reported for address overflows. The ADDR output
- *		argument is optional.
- *
- * 		Robb Matzke, 1999-07-28
- *		The ADDR argument is passed by value.
- *
- * 		Robb Matzke, 1999-08-06
- *		Modified to work with the virtual file layer.
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -238,8 +215,6 @@ H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off /*out*/)
  *
  * Programmer:  Albert Cheng
  *              Jan  8, 2003
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -301,8 +276,6 @@ done:
  *
  * Programmer:  Albert Cheng
  *              Jan  8, 2003
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -348,9 +321,6 @@ done:
  * Programmer:	rky
  *              19981207
  *
- * Modifications:
- *		Robb Matzke, 1999-08-09
- *		Modified to work with the virtual file layer.
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -402,9 +372,6 @@ done:
  * Programmer:	rky
  *              19981207
  *
- * Modifications:
- *		Robb Matzke, 1999-08-09
- *		Modified to work with the virtual file layer.
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 83b800b..07ad184 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -22,14 +22,14 @@
 /* Interface initialization */
 #define H5_INTERFACE_INIT_FUNC H5FD_mpio_init_interface
 
-#include "H5private.h"   /* Generic Functions      */
-#include "H5Dprivate.h"  /* Dataset functions      */
-#include "H5Eprivate.h"  /* Error handling        */
-#include "H5Fprivate.h"  /* File access        */
-#include "H5FDprivate.h" /* File drivers        */
-#include "H5FDmpi.h"     /* MPI-based file drivers    */
-#include "H5Iprivate.h"  /* IDs            */
-#include "H5MMprivate.h" /* Memory management      */
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5Dprivate.h"  /* Dataset functions                    */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5FDprivate.h" /* File drivers                         */
+#include "H5FDmpi.h"     /* MPI-based file drivers               */
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5MMprivate.h" /* Memory management                    */
 #include "H5Pprivate.h"  /* Property lists                       */
 
 #ifdef H5_HAVE_PARALLEL
@@ -180,13 +180,13 @@ H5FD_mpio_init_interface(void)
 } /* H5FD_mpio_init_interface() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_init
+ * Function:    H5FD_mpio_init
  *
- * Purpose:  Initialize this driver by registering the driver with the
- *    library.
+ * Purpose:     Initialize this driver by registering the driver with the
+ *              library.
  *
- * Return:  Success:  The driver ID for the mpio driver.
- *    Failure:  Negative.
+ * Return:      Success:    The driver ID for the mpio driver
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Robb Matzke
  *              Thursday, August 5, 1999
@@ -198,11 +198,11 @@ H5FD_mpio_init(void)
 {
 #ifdef H5FDmpio_DEBUG
     static int H5FD_mpio_Debug_inited = 0;
-#endif                     /* H5FDmpio_DEBUG */
-    const char *s;         /* String for environment variables */
-    hid_t       ret_value; /* Return value */
+#endif                                       /* H5FDmpio_DEBUG */
+    const char *s;                           /* String for environment variables */
+    hid_t       ret_value = H5I_INVALID_HID; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     /* Register the MPI-IO VFD, if it isn't already */
     if (H5I_VFL != H5I_get_type(H5FD_MPIO_g))
@@ -236,17 +236,15 @@ done:
 } /* end H5FD_mpio_init() */
 
 /*---------------------------------------------------------------------------
- * Function:  H5FD_mpio_term
+ * Function:    H5FD_mpio_term
  *
- * Purpose:  Shut down the VFD
+ * Purpose:     Shut down the VFD
  *
  * Return:  <none>
  *
  * Programmer:  Quincey Koziol
  *              Friday, Jan 30, 2004
  *
- * Modification:
- *
  *---------------------------------------------------------------------------
  */
 void
@@ -261,61 +259,33 @@ H5FD_mpio_term(void)
 } /* end H5FD_mpio_term() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pset_fapl_mpio
+ * Function:    H5Pset_fapl_mpio
  *
- * Purpose:  Store the user supplied MPIO communicator comm and info in
- *    the file access property list FAPL_ID which can then be used
- *    to create and/or open the file.  This function is available
- *    only in the parallel HDF5 library and is not collective.
+ * Purpose:     Store the user supplied MPIO communicator comm and info in
+ *              the file access property list FAPL_ID which can then be used
+ *              to create and/or open the file.  This function is available
+ *              only in the parallel HDF5 library and is not collective.
  *
- *    comm is the MPI communicator to be used for file open as
- *    defined in MPI_FILE_OPEN of MPI-2. This function makes a
- *    duplicate of comm. Any modification to comm after this function
- *    call returns has no effect on the access property list.
+ *              comm is the MPI communicator to be used for file open as
+ *              defined in MPI_FILE_OPEN of MPI-2. This function makes a
+ *              duplicate of comm. Any modification to comm after this function
+ *              call returns has no effect on the access property list.
  *
- *    info is the MPI Info object to be used for file open as
- *    defined in MPI_FILE_OPEN of MPI-2. This function makes a
- *    duplicate of info. Any modification to info after this
- *    function call returns has no effect on the access property
- *    list.
+ *              info is the MPI Info object to be used for file open as
+ *              defined in MPI_FILE_OPEN of MPI-2. This function makes a
+ *              duplicate of info. Any modification to info after this
+ *              function call returns has no effect on the access property
+ *              list.
  *
  *              If fapl_id has previously set comm and info values, they
  *              will be replaced and the old communicator and Info object
  *              are freed.
  *
- * Return:  Success:  Non-negative
- *
- *     Failure:  Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
  * Programmer:  Albert Cheng
- *    Feb 3, 1998
- *
- * Modifications:
- *    Robb Matzke, 1998-02-18
- *    Check all arguments before the property list is updated so we
- *    don't leave the property list in a bad state if something
- *    goes wrong.  Also, the property list data type changed to
- *    allow more generality so all the mpi-related stuff is in the
- *    `u.mpi' member.  The `access_mode' will contain only
- *     mpi-related flags defined in H5Fpublic.h.
- *
- *    Albert Cheng, 1998-04-16
- *    Removed the ACCESS_MODE argument.  The access mode is changed
- *    to be controlled by data transfer property list during data
- *    read/write calls.
- *
- *     Robb Matzke, 1999-08-06
- *    Modified to work with the virtual file layer.
- *
- *    Raymond Lu, 2001-10-23
- *    Changed the file access list to the new generic property
- *    list.
- *
- *    Albert Cheng, 2003-04-17
- *    Modified the description of the function that it now stores
- *    a duplicate of the communicator and INFO object.  Free the
- *    old duplicates if previously set.  (Work is actually done
- *    by H5P_set_driver.)
+ *              Feb 3, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -329,10 +299,9 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iMcMi", fapl_id, comm, info);
 
+    /* Check arguments */
     if (fapl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
     if (MPI_COMM_NULL == comm)
@@ -347,43 +316,28 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* H5Pset_fapl_mpio() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pget_fapl_mpio
- *
- * Purpose:  If the file access property list is set to the H5FD_MPIO
- *    driver then this function returns duplicates of the MPI
- *    communicator and Info object stored through the comm and
- *    info pointers.  It is the responsibility of the application
- *    to free the returned communicator and Info object.
- *
- * Return:  Success:  Non-negative with the communicator and
- *        Info object returned through the comm and
- *        info arguments if non-null. Since they are
- *        duplicates of the stored objects, future
- *        modifications to the access property list do
- *        not affect them and it is the responsibility
- *        of the application to free them.
- *
- *     Failure:  Negative
+ * Function:    H5Pget_fapl_mpio
+ *
+ * Purpose:     If the file access property list is set to the H5FD_MPIO
+ *              driver then this function returns duplicates of the MPI
+ *              communicator and Info object stored through the comm and
+ *              info pointers.  It is the responsibility of the application
+ *              to free the returned communicator and Info object.
+ *
+ * Return:      Success:    Non-negative with the communicator and
+ *                          Info object returned through the comm and
+ *                          info arguments if non-null. Since they are
+ *                          duplicates of the stored objects, future
+ *                          modifications to the access property list do
+ *                          not affect them and it is the responsibility
+ *                          of the application to free them.
+ *              Failure:    Negative
  *
  * Programmer:  Robb Matzke
- *    Thursday, February 26, 1998
- *
- * Modifications:
- *
- *          Albert Cheng, Apr 16, 1998
- *          Removed the access_mode argument.  The access_mode is changed
- *          to be controlled by data transfer property list during data
- *          read/write calls.
- *
- *    Raymond Lu, 2001-10-23
- *    Changed the file access list to the new generic property
- *    list.
- *
- *    Albert Cheng, 2003-04-17
- *    Return duplicates of the stored communicator and Info object.
+ *              Thursday, February 26, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -419,44 +373,46 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/)
         if (MPI_INFO_NULL != fa->info) {
             if (MPI_SUCCESS != (mpi_code = MPI_Info_dup(fa->info, info)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
-        }
-        else {
+        } /* end if */
+        else
             /* do not dup it */
             *info = MPI_INFO_NULL;
-        }
-    }
+    } /* end if */
 
+    /* Store the copied communicator, now that the Info object has been
+     *  successfully copied.
+     */
     if (comm)
         *comm = comm_tmp;
 
 done:
-    if (FAIL == ret_value) {
+    if (ret_value < 0)
         /* need to free anything created here */
         if (comm_tmp != MPI_COMM_NULL)
             MPI_Comm_free(&comm_tmp);
-    }
+
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Pget_fapl_mpio() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pset_dxpl_mpio
+ * Function:    H5Pset_dxpl_mpio
  *
- * Purpose:  Set the data transfer property list DXPL_ID to use transfer
- *    mode XFER_MODE. The property list can then be used to control
- *    the I/O transfer mode during data I/O operations. The valid
- *    transfer modes are:
+ * Purpose:     Set the data transfer property list DXPL_ID to use transfer
+ *              mode XFER_MODE. The property list can then be used to control
+ *              the I/O transfer mode during data I/O operations. The valid
+ *              transfer modes are:
  *
- *     H5FD_MPIO_INDEPENDENT:
- *      Use independent I/O access (the default).
+ *              H5FD_MPIO_INDEPENDENT:
+ *                  Use independent I/O access (the default).
  *
- *     H5FD_MPIO_COLLECTIVE:
- *      Use collective I/O access.
+ *              H5FD_MPIO_COLLECTIVE:
+ *                  Use collective I/O access.
  *
- * Return:  Success:  Non-negative
- *     Failure:  Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
  * Programmer:  Albert Cheng
- *    April 2, 1998
+ *              April 2, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -469,10 +425,9 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDt", dxpl_id, xfer_mode);
 
+    /* Check arguments */
     if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
     if (H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
@@ -487,19 +442,18 @@ done:
 } /* end H5Pset_dxpl_mpio() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pget_dxpl_mpio
+ * Function:    H5Pget_dxpl_mpio
  *
- * Purpose:  Queries the transfer mode current set in the data transfer
- *    property list DXPL_ID. This is not collective.
+ * Purpose:     Queries the transfer mode current set in the data transfer
+ *              property list DXPL_ID. This is not collective.
  *
- * Return:  Success:  Non-negative, with the transfer mode returned
- *        through the XFER_MODE argument if it is
- *        non-null.
- *
- *     Failure:  Negative
+ * Return:      Success:    Non-negative, with the transfer mode returned
+ *                          through the XFER_MODE argument if it is
+ *                          non-null.
+ *              Failure:    Negative
  *
  * Programmer:  Albert Cheng
- *    April 2, 1998
+ *              April 2, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -512,6 +466,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/)
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", dxpl_id, xfer_mode);
 
+    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
@@ -525,21 +480,20 @@ done:
 } /* end H5Pget_dxpl_mpio() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pset_dxpl_mpio_collective_opt
+ * Function:    H5Pset_dxpl_mpio_collective_opt
  *
- * Purpose:	To set a flag to choose linked chunk I/O or multi-chunk I/O
- *		without involving decision-making inside HDF5
+ * Purpose:     To set a flag to choose linked chunk I/O or multi-chunk I/O
+ *              without involving decision-making inside HDF5
  *
- * Note:	The library will do linked chunk I/O or multi-chunk I/O without
- *		involving communications for decision-making process.
- *		The library won't behave as it asks for only when we find
- *		that the low-level MPI-IO package doesn't support this.
+ * Note:        The library will do linked chunk I/O or multi-chunk I/O without
+ *              involving communications for decision-making process.
+ *              The library won't behave as it asks for only when we find
+ *              that the low-level MPI-IO package doesn't support this.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -552,10 +506,9 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDc", dxpl_id, opt_mode);
 
+    /* Check arguments */
     if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
@@ -568,21 +521,20 @@ done:
 } /* end H5Pset_dxpl_mpio_collective_opt() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pset_dxpl_mpio_chunk_opt
+ * Function:    H5Pset_dxpl_mpio_chunk_opt
  *
- * Purpose:	To set a flag to choose linked chunk I/O or multi-chunk I/O
- *		without involving decision-making inside HDF5
+ * Purpose:     To set a flag to choose linked chunk I/O or multi-chunk I/O
+ *              without involving decision-making inside HDF5
  *
- * Note:	The library will do linked chunk I/O or multi-chunk I/O without
- *		involving communications for decision-making process.
- *		The library won't behave as it asks for only when we find
- *		that the low-level MPI-IO package doesn't support this.
+ * Note:        The library will do linked chunk I/O or multi-chunk I/O without
+ *              involving communications for decision-making process.
+ *              The library won't behave as it asks for only when we find
+ *              that the low-level MPI-IO package doesn't support this.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -595,10 +547,9 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDh", dxpl_id, opt_mode);
 
+    /* Check arguments */
     if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
@@ -611,19 +562,18 @@ done:
 } /* end H5Pset_dxpl_mpio_chunk_opt() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pset_dxpl_mpio_chunk_opt_num
+ * Function:    H5Pset_dxpl_mpio_chunk_opt_num
  *
- * Purpose:	To set a threshold for doing linked chunk IO
+ * Purpose:     To set a threshold for doing linked chunk IO
  *
- * Note:	If the number is greater than the threshold set by the user,
- *		the library will do linked chunk I/O; otherwise, I/O will be
- *		done for every chunk.
+ * Note:        If the number is greater than the threshold set by the user,
+ *              the library will do linked chunk I/O; otherwise, I/O will be
+ *              done for every chunk.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -636,10 +586,9 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc);
 
+    /* Check arguments */
     if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
@@ -652,22 +601,21 @@ done:
 } /* end H5Pset_dxpl_mpio_chunk_opt_num() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5Pset_dxpl_mpio_chunk_opt_ratio
+ * Function:    H5Pset_dxpl_mpio_chunk_opt_ratio
  *
- * Purpose:	To set a threshold for doing collective I/O for each chunk
+ * Purpose:     To set a threshold for doing collective I/O for each chunk
  *
- * Note:	The library will calculate the percentage of the number of
- *		process holding selections at each chunk. If that percentage
- *		of number of process in the individual chunk is greater than
- *		the threshold set by the user, the library will do collective
- *		chunk I/O for this chunk; otherwise, independent I/O will be
- *		done for this chunk.
+ * Note:        The library will calculate the percentage of the number of
+ *              process holding selections at each chunk. If that percentage
+ *              of number of process in the individual chunk is greater than
+ *              the threshold set by the user, the library will do collective
+ *              chunk I/O for this chunk; otherwise, independent I/O will be
+ *              done for this chunk.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -680,10 +628,9 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk);
 
+    /* Check arguments */
     if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
     if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
@@ -696,17 +643,17 @@ done:
 } /* end H5Pset_dxpl_mpio_chunk_opt_ratio() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_fapl_get
+ * Function:    H5FD_mpio_fapl_get
  *
- * Purpose:  Returns a file access property list which could be used to
- *    create another file the same as this one.
+ * Purpose:    Returns a file access property list which could be used to
+ *        create another file the same as this one.
  *
- * Return:  Success:  Ptr to new file access property list with all
- *        fields copied from the file pointer.
+ * Return:    Success:    Ptr to new file access property list with all
+ *                fields copied from the file pointer.
  *
- *    Failure:  NULL
+ *        Failure:    NULL
  *
- * Programmer:  Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
  *
  *-------------------------------------------------------------------------
@@ -738,15 +685,15 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_fapl_copy
+ * Function:    H5FD_mpio_fapl_copy
  *
- * Purpose:  Copies the mpio-specific file access properties.
+ * Purpose:    Copies the mpio-specific file access properties.
  *
- * Return:  Success:  Ptr to a new property list
+ * Return:    Success:    Ptr to a new property list
  *
- *    Failure:  NULL
+ *        Failure:    NULL
  *
- * Programmer:  Albert Cheng
+ * Programmer:    Albert Cheng
  *              Jan  8, 2003
  *
  *-------------------------------------------------------------------------
@@ -790,19 +737,17 @@ done:
 } /* end H5FD_mpio_fapl_copy() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_fapl_free
+ * Function:    H5FD_mpio_fapl_free
  *
- * Purpose:  Frees the mpio-specific file access properties.
+ * Purpose:    Frees the mpio-specific file access properties.
  *
- * Return:  Success:  0
+ * Return:    Success:    0
  *
- *    Failure:  -1
+ *        Failure:    -1
  *
- * Programmer:  Albert Cheng
+ * Programmer:    Albert Cheng
  *              Jan  8, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -831,16 +776,14 @@ H5FD_mpio_fapl_free(void *_fa)
 } /* end H5FD_mpio_fapl_free() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_set_mpio_atomicity
- *
- * Purpose:	Sets the atomicity mode
+ * Function:    H5FD_set_mpio_atomicity
  *
- * Return:	Success:	Non-negative
+ * Purpose:     Sets the atomicity mode
  *
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
@@ -856,7 +799,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering H5FD_set_mpio_atomicity\n");
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     if (FALSE == flag)
@@ -871,22 +814,21 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving H5FD_set_mpio_atomicity\n");
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
+
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_set_mpio_atomicity() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_get_mpio_atomicity
- *
- * Purpose:	Returns the atomicity mode
+ * Function:    H5FD_get_mpio_atomicity
  *
- * Return:	Success:	Non-negative
+ * Purpose:     Returns the atomicity mode
  *
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
@@ -902,10 +844,10 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering H5FD_get_mpio_atomicity\n");
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
-    /* get atomicity value */
+    /* Get atomicity value */
     if (MPI_SUCCESS != (mpi_code = MPI_File_get_atomicity(file->f, &temp_flag)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_get_atomicity", mpi_code)
 
@@ -917,54 +859,28 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving H5FD_get_mpio_atomicity\n");
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
+
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_get_mpio_atomicity() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_open
  *
  * Purpose:     Opens a file with name NAME.  The FLAGS are a bit field with
- *    purpose similar to the second argument of open(2) and which
- *    are defined in H5Fpublic.h. The file access property list
- *    FAPL_ID contains the properties driver properties and MAXADDR
- *    is the largest address which this file will be expected to
- *    access.  This is collective.
- *
- * Return:      Success:        A new file pointer.
+ *              purpose similar to the second argument of open(2) and which
+ *              are defined in H5Fpublic.h. The file access property list
+ *              FAPL_ID contains the properties driver properties and MAXADDR
+ *              is the largest address which this file will be expected to
+ *              access.  This is collective.
  *
- *              Failure:        NULL
+ * Return:      Success:    A new file pointer
+ *              Failure:    NULL
  *
- * Programmer:
+ * Programmer:  Robert Kim Yates
  *              January 30, 1998
  *
- * Modifications:
- *     Robb Matzke, 1998-02-18
- *    Added the ACCESS_PARMS argument.  Moved some error checking
- *    here from elsewhere.
- *
- *        rky, 1998-01-11
- *        Added H5FD_mpio_Debug debug flags controlled by MPI_Info.
- *
- *        rky, 1998-08-28
- *    Init flag controlling redundant metadata writes to disk.
- *
- *        rky, 1998-12-07
- *    Added barrier after MPI_File_set_size to prevent race
- *    condition -- subsequent writes were being truncated, causing
- *    holes in file.
- *
- *     Robb Matzke, 1999-08-06
- *    Modified to work with the virtual file layer.
- *
- *        rky & ppw, 1999-11-07
- *    Modified "H5FD_mpio_open" so that file-truncation is
- *              avoided for brand-new files (with zero filesize).
- *
- *     Albert Cheng, 2003-04-17
- *     Duplicate the communicator and Info object so that file is
- *     insulated from the old one.
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
@@ -996,25 +912,25 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR_
     }
 #endif
 
-    /* Obtain a pointer to mpio-specific file access properties */
+    /* Get a pointer to the fapl */
     if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
     if (H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MPIO != H5P_get_driver(plist)) {
         _fa.comm = MPI_COMM_SELF; /*default*/
         _fa.info = MPI_INFO_NULL; /*default*/
         fa       = &_fa;
-    }
+    } /* end if */
     else {
         if (NULL == (fa = (const H5FD_mpio_fapl_t *)H5P_get_driver_info(plist)))
             HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
-    }
+    } /* end else */
 
     /* Duplicate communicator and Info object for use by this file. */
     if (FAIL == H5FD_mpi_comm_info_dup(fa->comm, fa->info, &comm_dup, &info_dup))
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
 
-    /* convert HDF5 flags to MPI-IO flags */
-    /* some combinations are illegal; let MPI-IO figure it out */
+    /* Convert HDF5 flags to MPI-IO flags */
+    /* Some combinations are illegal; let MPI-IO figure it out */
     mpi_amode = (flags & H5F_ACC_RDWR) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
     if (flags & H5F_ACC_CREAT)
         mpi_amode |= MPI_MODE_CREATE;
@@ -1100,32 +1016,22 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving H5FD_mpio_open\n");
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
+
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_mpio_open() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_close
  *
  * Purpose:     Closes a file.  This is collective.
  *
- * Return:      Success:  Non-negative
- *
- *     Failure:  Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Unknown
  *              January 30, 1998
  *
- * Modifications:
- *     Robb Matzke, 1998-02-18
- *    Added the ACCESS_PARMS argument.
- *
- *     Robb Matzke, 1999-08-06
- *    Modified to work with the virtual file layer.
- *
- *     Albert Cheng, 2003-04-17
- *    Free the communicator stored.
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1139,8 +1045,10 @@ H5FD_mpio_close(H5FD_t *_file)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering H5FD_mpio_close\n");
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
+
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
@@ -1155,33 +1063,23 @@ H5FD_mpio_close(H5FD_t *_file)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving H5FD_mpio_close\n");
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
+
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_mpio_close() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_query
+ * Function:    H5FD_mpio_query
  *
- * Purpose:  Set the flags that this VFL driver is capable of supporting.
+ * Purpose:     Set the flags that this VFL driver is capable of supporting.
  *              (listed in H5FDpublic.h)
  *
- * Return:  Success:  non-negative
- *
- *    Failure:  negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Quincey Koziol
  *              Friday, August 25, 2000
  *
- * Modifications:
- *
- *    John Mainzer -- 9/21/05
- *    Modified code to turn off the
- *    H5FD_FEAT_ACCUMULATE_METADATA_WRITE flag.
- *              With the movement of
- *    all cache writes to process 0, this flag has become
- *    problematic in PHDF5.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1199,27 +1097,21 @@ H5FD_mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
     }                                            /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}
+} /* end H5FD_mpio_query() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_get_eoa
- *
- * Purpose:  Gets the end-of-address marker for the file. The EOA marker
- *    is the first address past the last byte allocated in the
- *    format address space.
+ * Function:    H5FD_mpio_get_eoa
  *
- * Return:  Success:  The end-of-address marker.
+ * Purpose:     Gets the end-of-address marker for the file. The EOA marker
+ *              is the first address past the last byte allocated in the
+ *              format address space.
  *
- *    Failure:  HADDR_UNDEF
+ * Return:      Success:    The end-of-address marker
+ *              Failure:    HADDR_UNDEF
  *
  * Programmer:  Robb Matzke
  *              Friday, August  6, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -1229,31 +1121,25 @@ H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->eoa)
-}
+} /* end H5FD_mpio_get_eoa() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_set_eoa
+ * Function:    H5FD_mpio_set_eoa
  *
- * Purpose:  Set the end-of-address marker for the file. This function is
- *    called shortly after an existing HDF5 file is opened in order
- *    to tell the driver where the end of the HDF5 data is located.
+ * Purpose:     Set the end-of-address marker for the file. This function is
+ *              called shortly after an existing HDF5 file is opened in order
+ *              to tell the driver where the end of the HDF5 data is located.
  *
- * Return:  Success:  0
- *
- *    Failure:  -1
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Robb Matzke
  *              Friday, August 6, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1263,41 +1149,39 @@ H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     file->eoa = addr;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}
+} /* end H5FD_mpio_set_eoa() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_get_eof
+ * Function:    H5FD_mpio_get_eof
  *
- * Purpose:  Gets the end-of-file marker for the file. The EOF marker
- *    is the real size of the file.
+ * Purpose:     Gets the end-of-file marker for the file. The EOF marker
+ *              is the real size of the file.
  *
- *    The MPIO driver doesn't bother keeping this field updated
- *    since that's a relatively expensive operation. Fortunately
- *    the library only needs the EOF just after the file is opened
- *    in order to determine whether the file is empty, truncated,
- *    or okay.  Therefore, any MPIO I/O function will set its value
- *    to HADDR_UNDEF which is the error return value of this
- *    function.
+ *              The MPIO driver doesn't bother keeping this field updated
+ *              since that's a relatively expensive operation. Fortunately
+ *              the library only needs the EOF just after the file is opened
+ *              in order to determine whether the file is empty, truncated,
+ *              or okay.  Therefore, any MPIO I/O function will set its value
+ *              to HADDR_UNDEF which is the error return value of this
+ *              function.
  *
  *              Keeping the EOF updated (during write calls) is expensive
  *              because any process may extend the physical end of the
  *              file. -QAK
  *
- * Return:  Success:  The end-of-address marker.
- *
- *    Failure:  HADDR_UNDEF
+ * Return:      Success:    The end-of-file marker
+ *              Failure:    HADDR_UNDEF
  *
  * Programmer:  Robb Matzke
  *              Friday, August  6, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -1307,24 +1191,23 @@ H5FD_mpio_get_eof(const H5FD_t *_file)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->eof)
-}
+} /* end H5FD_mpio_get_eof() */
 
 /*-------------------------------------------------------------------------
  * Function:       H5FD_mpio_get_handle
  *
  * Purpose:        Returns the file handle of MPIO file driver.
  *
- * Returns:        Non-negative if succeed or negative if fails.
+ * Returns:        SUCCEED/FAIL
  *
  * Programmer:     Raymond Lu
  *                 Sept. 16, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1342,7 +1225,7 @@ H5FD_mpio_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handl
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_mpio_get_handle() */
 
 /*-------------------------------------------------------------------------
  * Function:  H5FD_mpio_read
@@ -1434,8 +1317,10 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering H5FD_mpio_read\n");
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
+
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
     /* Make certain we have the correct type of property list */
@@ -1455,7 +1340,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'r'])
-        HDfprintf(stdout, "in H5FD_mpio_read  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
+        HDfprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", FUNC, (long)mpi_off, size_i);
 #endif
 
     /* Only look for MPI views for raw data transfers */
@@ -1578,131 +1463,31 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving H5FD_mpio_read\n");
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_mpio_read() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_write
+ * Function:    H5FD_mpio_write
  *
- * Purpose:  Writes SIZE bytes of data to FILE beginning at address ADDR
- *    from buffer BUF according to data transfer properties in
- *    DXPL_ID using potentially complex file and buffer types to
- *    effect the transfer.
+ * Purpose:     Writes SIZE bytes of data to FILE beginning at address ADDR
+ *              from buffer BUF according to data transfer properties in
+ *              DXPL_ID using potentially complex file and buffer types to
+ *              effect the transfer.
  *
- *    MPI is able to coalesce requests from different processes
- *    (collective and independent).
+ *              MPI is able to coalesce requests from different processes
+ *              (collective and independent).
  *
- * Return:  Success:  Zero. USE_TYPES and OLD_USE_TYPES in the
- *        access params are altered.
+ * Return:      Success:    SUCCEED. USE_TYPES and OLD_USE_TYPES in the
+ *                          access params are altered.
+ *              Failure:    FAIL. USE_TYPES and OLD_USE_TYPES in the
+ *                          access params may be altered.
  *
- *    Failure:  -1, USE_TYPES and OLD_USE_TYPES in the
- *        access params may be altered.
- *
- * Programmer:  Unknown
+ * Programmer:  Robert Kim Yates
  *              January 30, 1998
  *
- * Modifications:
- *    rky, 1998-08-28
- *    If the file->allsame flag is set, we assume that all the
- *    procs in the relevant MPI communicator will write identical
- *    data at identical offsets in the file, so only proc 0 will
- *    write, and all other procs will wait for p0 to finish. This
- *    is useful for writing metadata, for example. Note that we
- *    don't _check_ that the data is identical. Also, the mechanism
- *    we use to eliminate the redundant writes is by requiring a
- *    call to H5FD_mpio_tas_allsame before the write, which is
- *    rather klugey. Would it be better to pass a parameter to
- *    low-level writes like H5F_block_write and H5F_low_write,
- *    instead?  Or...??? Also, when I created this mechanism I
- *    wanted to minimize the difference in behavior between the old
- *    way of doing things (i.e., all procs write) and the new way,
- *    so the writes are eliminated at the very lowest level, here
- *    in H5FD_mpio_write. It may be better to rethink that, and
- *    short-circuit the writes at a higher level (e.g., at the
- *    points in the code where H5FD_mpio_tas_allsame is called).
- *
- *
- *     Robb Matzke, 1998-02-18
- *    Added the ACCESS_PARMS argument.
- *
- *     rky, 1998-04-10
- *    Call independent or collective MPI write, based on
- *    ACCESS_PARMS.
- *
- *     rky, 1998-04-24
- *    Removed redundant write from H5FD_mpio_write.
- *
- *     Albert Cheng, 1998-06-01
- *    Added XFER_MODE to control independent or collective MPI
- *    write.
- *
- *     rky, 1998-08-16
- *    Use BTYPE, FTYPE, and DISP from access parms. The guts of
- *    H5FD_mpio_read and H5FD_mpio_write should be replaced by a
- *    single dual-purpose routine.
- *
- *     rky, 1998-08-28
- *    Added ALLSAME parameter to make all but proc 0 skip the
- *    actual write.
- *
- *     Robb Matzke, 1999-04-21
- *    Changed XFER_MODE to XFER_PARMS for all H5FD_*_write()
- *    callbacks.
- *
- *     Robb Matzke, 1999-07-28
- *    The ADDR argument is passed by value.
- *
- *     Robb Matzke, 1999-08-06
- *    Modified to work with the virtual file layer.
- *
- *    Albert Cheng, 1999-12-19
- *    When only-p0-write-allsame-data, p0 Bcasts the
- *    ret_value to other processes.  This prevents
- *    a racing condition (that other processes try to
- *    read the file before p0 finishes writing) and also
- *    allows all processes to report the same ret_value.
- *
- *    Kim Yates, Pat Weidhaas,  2000-09-26
- *    Move block of coding where only p0 writes after the
- *              MPI_File_set_view call.
- *
- *    Quincey Koziol,  2002-05-10
- *    Instead of always writing metadata from process 0, spread the
- *              burden among all the processes by using a round-robin rotation
- *              scheme.
- *
- *    Quincey Koziol,  2002-05-10
- *    Removed allsame code, keying off the type parameter instead.
- *
- *    Quincey Koziol,  2002-05-14
- *    Only call MPI_Get_count if we can use MPI_BYTE for the MPI type
- *              for the I/O transfer.  Someday we might include code to decode
- *              the MPI type used for more complicated transfers and call
- *              MPI_Get_count all the time.
- *
- *              Quincey Koziol - 2002/06/17
- *              Removed 'disp' parameter from H5FD_mpio_setup routine and use
- *              the address of the dataset in MPI_File_set_view() calls, as
- *              necessary.
- *
- *              Quincey Koziol - 2002/06/24
- *              Removed "lazy" MPI_File_set_view() calls, since they would fail
- *              if the first I/O was a collective I/O using MPI derived types
- *              and the next I/O was an independent I/O.
- *
- *              Quincey Koziol - 2002/07/18
- *              Added "block_before_meta_write" dataset transfer flag, which
- *              is set during writes from a metadata cache flush and indicates
- *              that all the processes must sync up before (one of them)
- *              writing metadata.
- *
- *              Quincey Koziol - 2003/10/22-31
- *              Restructured code massively, straightening out logic and finally
- *              getting the bytes_written stuff working.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1724,8 +1509,10 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering H5FD_mpio_write\n");
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
+
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
     /* Make certain we have the correct type of property list */
@@ -1745,7 +1532,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'w'])
-        HDfprintf(stdout, "in H5FD_mpio_write  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
+        HDfprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", FUNC, (long)mpi_off, size_i);
 #endif
 
     if (type == H5FD_MEM_DRAW) {
@@ -1810,6 +1597,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
         if (H5FD_mpio_Debug[(int)'t'])
             HDfprintf(stdout, "H5FD_mpio_write: using MPIO collective mode\n");
 #endif
+
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
         HDassert(plist);
         /* get the transfer mode from the dxpl */
@@ -1871,8 +1659,9 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n", file->mpi_rank, ret_value);
+        HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", FUNC, file->mpi_rank, ret_value);
 #endif
+
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_write() */
 
@@ -1881,9 +1670,7 @@ done:
  *
  * Purpose:     Makes sure that all data is on disk.  This is collective.
  *
- * Return:      Success:  Non-negative
- *
- *     Failure:  Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Robb Matzke
  *              January 30, 1998
@@ -1901,21 +1688,22 @@ H5FD_mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned closing)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering %s\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
+
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* Only sync the file if we are not going to immediately close it */
-    if (!closing) {
+    if (!closing)
         if (MPI_SUCCESS != (mpi_code = MPI_File_sync(file->f)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_sync failed", mpi_code)
-    } /* end if */
 
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving %s\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1944,8 +1732,10 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Entering %s\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
+
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
@@ -1980,25 +1770,23 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "Leaving %s\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_truncate() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_mpi_rank
+ * Function:    H5FD_mpio_mpi_rank
  *
- * Purpose:  Returns the MPI rank for a process
+ * Purpose:     Returns the MPI rank for a process
  *
- * Return:  Success: non-negative
- *    Failure: negative
+ * Return:      Success: non-negative
+ *              Failure: negative
  *
  * Programmer:  Quincey Koziol
  *              Thursday, May 16, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2008,6 +1796,7 @@ H5FD_mpio_mpi_rank(const H5FD_t *_file)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
@@ -2015,18 +1804,16 @@ H5FD_mpio_mpi_rank(const H5FD_t *_file)
 } /* end H5FD_mpio_mpi_rank() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_mpi_size
+ * Function:    H5FD_mpio_mpi_size
  *
- * Purpose:  Returns the number of MPI processes
+ * Purpose:     Returns the number of MPI processes
  *
- * Return:  Success: non-negative
- *    Failure: negative
+ * Return:      Success: non-negative
+ *              Failure: negative
  *
  * Programmer:  Quincey Koziol
  *              Thursday, May 16, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2036,6 +1823,7 @@ H5FD_mpio_mpi_size(const H5FD_t *_file)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
@@ -2043,19 +1831,16 @@ H5FD_mpio_mpi_size(const H5FD_t *_file)
 } /* end H5FD_mpio_mpi_size() */
 
 /*-------------------------------------------------------------------------
- * Function:  H5FD_mpio_communicator
- *
- * Purpose:  Returns the MPI communicator for the file.
+ * Function:    H5FD_mpio_communicator
  *
- * Return:  Success:  The communicator
+ * Purpose:     Returns the MPI communicator for the file.
  *
- *    Failure:  NULL
+ * Return:      Success:    The communicator
+ *              Failure:    Can't fail
  *
  * Programmer:  Robb Matzke
  *              Monday, August  9, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static MPI_Comm
@@ -2065,10 +1850,11 @@ H5FD_mpio_communicator(const H5FD_t *_file)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Sanity checks */
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     FUNC_LEAVE_NOAPI(file->comm)
-}
+} /* end H5FD_mpio_communicator() */
 
 #endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 1a5a5c0..5072209 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -26,11 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* Disable certain warnings in PC-Lint: */
-/*lint --emacro( {534, 830}, H5P_DEFAULT, H5P_FILE_ACCESS, H5P_DATASET_XFER) */
-/*lint --emacro( {534, 830}, H5FD_MULTI) */
-/*lint -esym( 534, H5Eclear2, H5Epush2) */
-
 #include "hdf5.h"
 
 /* Our version of MAX */
@@ -83,7 +78,7 @@ typedef struct H5FD_multi_fapl_t {
     hid_t      memb_fapl[H5FD_MEM_NTYPES]; /*member access properties      */
     char *     memb_name[H5FD_MEM_NTYPES]; /*name generators               */
     haddr_t    memb_addr[H5FD_MEM_NTYPES]; /*starting addr per member      */
-    hbool_t    relax;                      /*less stringent error checking    */
+    hbool_t    relax;                      /*less stringent error checking */
 } H5FD_multi_fapl_t;
 
 /*
@@ -183,7 +178,7 @@ static const H5FD_class_t H5FD_multi_g = {
  *
  * Return:    Success:    Ptr to new copy of string
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
@@ -209,14 +204,13 @@ my_strdup(const char *s)
 /*-------------------------------------------------------------------------
  * Function:    H5FD_multi_init
  *
- * Purpose:    Initialize this driver by registering the driver with the
- *        library.
- *
- * Return:    Success:    The driver ID for the multi driver.
+ * Purpose:     Initialize this driver by registering the driver with the
+ *              library.
  *
- *        Failure:    Negative
+ * Return:      Success:    The driver ID for the multi driver
+ *              Failure:    H5I_INVALID_HID
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -231,14 +225,14 @@ H5FD_multi_init(void)
         H5FD_MULTI_g = H5FDregister(&H5FD_multi_g);
 
     return H5FD_MULTI_g;
-}
+} /* end H5FD_multi_init() */
 
 /*---------------------------------------------------------------------------
  * Function:    H5FD_multi_term
  *
- * Purpose:    Shut down the VFD
+ * Purpose:     Shut down the VFD
  *
- * Return:    <none>
+ * Returns:     Non-negative on success or negative on failure
  *
  * Programmer:  Quincey Koziol
  *              Friday, Jan 30, 2004
@@ -262,7 +256,7 @@ H5FD_multi_term(void)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August 11, 1999
@@ -371,7 +365,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const c
  *        memb_map:    The default member map has the value
  *                H5FD_MEM_DEFAULT for each element.
  *
- *         memb_fapl:    The value H5P_DEFAULT for each element.
+ *        memb_fapl:    The value H5P_DEFAULT for each element.
  *
  *        memb_name:    The string `%s-X.h5' where `X' is one of the
  *                letters `s' (H5FD_MEM_SUPER),
@@ -379,26 +373,26 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const c
  *                 `g' (H5FD_MEM_GHEAP), 'l' (H5FD_MEM_LHEAP),
  *                 `o' (H5FD_MEM_OHDR).
  *
- *         memb_addr:    The value HADDR_UNDEF for each element.
+ *        memb_addr:    The value HADDR_UNDEF for each element.
  *
  *
  * Example:    To set up a multi file access property list which partitions
  *        data into meta and raw files each being 1/2 of the address
  *        space one would say:
  *
- *             H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
+ *            H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
  *            hid_t memb_fapl[H5FD_MEM_NTYPES];
  *            const char *memb[H5FD_MEM_NTYPES];
  *            haddr_t memb_addr[H5FD_MEM_NTYPES];
  *
- *             // The mapping...
- *             for (mt=0; mt<H5FD_MEM_NTYPES; mt++) {
+ *            // The mapping...
+ *            for (mt=0; mt<H5FD_MEM_NTYPES; mt++) {
  *                memb_map[mt] = H5FD_MEM_SUPER;
  *            }
- *             memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
+ *            memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
  *
- *             // Member information
- *             memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
+ *            // Member information
+ *            memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
  *            memb_name[H5FD_MEM_SUPER] = "%s.meta";
  *            memb_addr[H5FD_MEM_SUPER] = 0;
  *
@@ -406,14 +400,14 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const c
  *            memb_name[H5FD_MEM_DRAW] = "%s.raw";
  *            memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
  *
- *             hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
+ *            hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
  *            H5Pset_fapl_multi(fapl, memb_map, memb_fapl,
  *                              memb_name, memb_addr, TRUE);
  *
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -512,7 +506,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_f
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -523,9 +517,9 @@ herr_t
 H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl /*out*/,
                   char **memb_name /*out*/, haddr_t *memb_addr /*out*/, hbool_t *relax)
 {
-    H5FD_multi_fapl_t *fa;
-    H5FD_mem_t         mt;
-    static const char *func = "H5FDget_fapl_multi"; /* Function Name for error reporting */
+    const H5FD_multi_fapl_t *fa;
+    H5FD_mem_t               mt;
+    static const char *      func = "H5FDget_fapl_multi"; /* Function Name for error reporting */
 
     /*NO TRACE*/
 
@@ -536,7 +530,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl
         H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not an access list",
                     -1) if (H5FD_MULTI != H5Pget_driver(fapl_id))
             H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "incorrect VFL driver",
-                        -1) if (NULL == (fa = (H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id)))
+                        -1) if (NULL == (fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id)))
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "bad VFL driver info", -1)
 
                     if (memb_map) memcpy(memb_map, fa->memb_map, H5FD_MEM_NTYPES * sizeof(H5FD_mem_t));
@@ -568,11 +562,11 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl
  * Function:    H5FD_multi_sb_size
  *
  * Purpose:    Returns the size of the private information to be stored in
- *        the superblock.
+ *             the superblock.
  *
  * Return:    Success:    The super block driver data size.
  *
- *        Failure:    never fails
+ *            Failure:    never fails
  *
  * Programmer:    Robb Matzke
  *              Monday, August 16, 1999
@@ -623,7 +617,7 @@ H5FD_multi_sb_size(H5FD_t *_file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 16, 1999
@@ -706,7 +700,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 16, 1999
@@ -766,7 +760,8 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
     buf += nseen * 2 * 8;
     if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HADDR, nseen * 2, x, NULL, H5P_DEFAULT) < 0)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
-            ap = (haddr_t *)x;
+            ap = (haddr_t *)((void *)x); /* Extra (void *) cast to quiet "cast to create alignment" warning -
+                                            2019/07/05, QAK */
     UNIQUE_MEMBERS(map, mt)
     {
         memb_addr[_unmapped] = *ap++;
@@ -853,7 +848,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
  * Return:    Success:    Ptr to new file access property list with all
  *                members copied from the file struct.
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
@@ -878,7 +873,7 @@ H5FD_multi_fapl_get(H5FD_t *_file)
  *
  * Return:    Success:    Ptr to a new property list
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -935,7 +930,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -973,7 +968,7 @@ H5FD_multi_fapl_free(void *_fa)
  *                public fields will be initialized by the
  *                caller, which is always H5FD_open().
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -983,11 +978,11 @@ H5FD_multi_fapl_free(void *_fa)
 static H5FD_t *
 H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_multi_t *     file       = NULL;
-    hid_t              close_fapl = -1;
-    H5FD_multi_fapl_t *fa;
-    H5FD_mem_t         m;
-    static const char *func = "H5FD_multi_open"; /* Function Name for error reporting */
+    H5FD_multi_t *           file       = NULL;
+    hid_t                    close_fapl = -1;
+    const H5FD_multi_fapl_t *fa;
+    H5FD_mem_t               m;
+    static const char *      func = "H5FD_multi_open"; /* Function Name for error reporting */
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -1076,7 +1071,7 @@ error:
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative with as many members closed as
+ *            Failure:    Negative with as many members closed as
  *                possible. The only subsequent operation
  *                permitted on the file is a close operation.
  *
@@ -1137,8 +1132,7 @@ H5FD_multi_close(H5FD_t *_file)
  *
  * Return:    Success:    like strcmp()
  *
- *        Failure:    never fails (arguments were checked by the
- *                caller).
+ *            Failure:    never fails (arguments were checked by th caller).
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1184,7 +1178,7 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, September 26, 2000
@@ -1213,7 +1207,7 @@ H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
  * Purpose:    Retrieve the memory type mapping for this file
  *
  * Return:    Success:    non-negative
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, October  9, 2008
@@ -1240,19 +1234,11 @@ H5FD_multi_get_type_map(const H5FD_t *_file, H5FD_mem_t *type_map)
  *
  * Return:    Success:    The end-of-address-marker
  *
- *        Failure:    HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              21 Dec. 2006
- *              Added the parameter TYPE.  It's only used for MULTI driver.
- *              If the TYPE is H5FD_MEM_DEFAULT, simply find the biggest
- *              EOA of individual file because the EOA for the whole file
- *              is meaningless.
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -1341,22 +1327,11 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              10 January 2007
- *              EOA for the whole file is discarded because it's meaningless
- *              for MULTI file.  This function only sets eoa for individual
- *              file.
- *
- *              Raymond Lu
- *              21 June 2011
- *              Backward compatibility of EOA.  Please the comment in the
- *              code.
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1408,7 +1383,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
  *                the end of the multi of files or the current
  *                EOA, whichever is larger.
  *
- *        Failure:          HADDR_UNDEF
+ *            Failure:          HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1508,7 +1483,7 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
  *
  * Return:    Success:    Address of new memory
  *
- *        Failure:    HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Thursday, August 12, 1999
@@ -1555,7 +1530,7 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Thursday, August 12, 1999
@@ -1590,7 +1565,7 @@ H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsi
  * Return:    Success:    Zero. Result is stored in caller-supplied
  *                buffer BUF.
  *
- *        Failure:    -1, contents of buffer BUF are undefined.
+ *            Failure:    -1, contents of buffer BUF are undefined.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1639,7 +1614,7 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
  *
  * Return:    Success:    Zero
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1686,7 +1661,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
  *
  * Return:    Success:    0
  *
- *        Failure:    -1, as many files flushed as possible.
+ *            Failure:    -1, as many files flushed as possible.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1759,7 +1734,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
  * Purpose:    Truncates all multi members.
  *
  * Return:    Success:    0
- *        Failure:    -1, as many files truncated as possible.
+ *            Failure:    -1, as many files truncated as possible.
  *
  * Programmer:    Quincey Koziol
  *              Thursday, January 31, 2008
@@ -1802,7 +1777,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 23, 1999
@@ -1844,7 +1819,7 @@ compute_next(H5FD_multi_t *file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 23, 1999
diff --git a/src/H5FDpkg.h b/src/H5FDpkg.h
index d480882..4d0d5e2 100644
--- a/src/H5FDpkg.h
+++ b/src/H5FDpkg.h
@@ -52,7 +52,7 @@ H5_DLL haddr_t H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsi
                                haddr_t *align_addr, hsize_t *align_size);
 H5_DLL herr_t  H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize_t size);
 
-/* Testing routines */
+/* Testing functions */
 #ifdef H5FD_TESTING
 #endif /* H5FD_TESTING */
 
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index f943108..e615ee6 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -123,13 +123,13 @@ typedef enum H5F_mem_t H5FD_mem_t;
 /* Define VFL driver features that can be enabled on a per-driver basis */
 /* These are returned with the 'query' function pointer in H5FD_class_t */
 /*
- * Defining the H5FD_FEAT_AGGREGATE_METADATA for a VFL driver means that
+ * Defining H5FD_FEAT_AGGREGATE_METADATA for a VFL driver means that
  * the library will attempt to allocate a larger block for metadata and
  * then sub-allocate each metadata request from that larger block.
  */
 #define H5FD_FEAT_AGGREGATE_METADATA 0x00000001
 /*
- * Defining the H5FD_FEAT_ACCUMULATE_METADATA for a VFL driver means that
+ * Defining H5FD_FEAT_ACCUMULATE_METADATA for a VFL driver means that
  * the library will attempt to cache metadata as it is written to the file
  * and build up a larger block of metadata to eventually pass to the VFL
  * 'write' routine.
@@ -145,7 +145,7 @@ typedef enum H5F_mem_t H5FD_mem_t;
 #define H5FD_FEAT_ACCUMULATE_METADATA                                                                        \
     (H5FD_FEAT_ACCUMULATE_METADATA_WRITE | H5FD_FEAT_ACCUMULATE_METADATA_READ)
 /*
- * Defining the H5FD_FEAT_DATA_SIEVE for a VFL driver means that
+ * Defining H5FD_FEAT_DATA_SIEVE for a VFL driver means that
  * the library will attempt to cache raw data as it is read from/written to
  * a file in a "data seive" buffer.  See Rajeev Thakur's papers:
  *  http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
@@ -153,13 +153,13 @@ typedef enum H5F_mem_t H5FD_mem_t;
  */
 #define H5FD_FEAT_DATA_SIEVE 0x00000008
 /*
- * Defining the H5FD_FEAT_AGGREGATE_SMALLDATA for a VFL driver means that
+ * Defining H5FD_FEAT_AGGREGATE_SMALLDATA for a VFL driver means that
  * the library will attempt to allocate a larger block for "small" raw data
  * and then sub-allocate "small" raw data requests from that larger block.
  */
 #define H5FD_FEAT_AGGREGATE_SMALLDATA 0x00000010
 /*
- * Defining the H5FD_FEAT_IGNORE_DRVRINFO for a VFL driver means that
+ * Defining H5FD_FEAT_IGNORE_DRVRINFO for a VFL driver means that
  * the library will ignore the driver info that is encoded in the file
  * for the VFL driver.  (This will cause the driver info to be eliminated
  * from the file when it is flushed/closed, if the file is opened R/W).
@@ -173,13 +173,13 @@ typedef enum H5F_mem_t H5FD_mem_t;
  */
 #define H5FD_FEAT_DIRTY_SBLK_LOAD 0x00000040
 /*
- * Defining the H5FD_FEAT_POSIX_COMPAT_HANDLE for a VFL driver means that
+ * Defining H5FD_FEAT_POSIX_COMPAT_HANDLE for a VFL driver means that
  * the handle for the VFD (returned with the 'get_handle' callback) is
  * of type 'int' and is compatible with POSIX I/O calls.
  */
 #define H5FD_FEAT_POSIX_COMPAT_HANDLE 0x00000080
 /*
- * Defining the H5FD_FEAT_HAS_MPI for a VFL driver means that
+ * Defining H5FD_FEAT_HAS_MPI for a VFL driver means that
  * the driver makes use of MPI communication and code may retrieve
  * communicator/rank information from it
  */
@@ -191,13 +191,13 @@ typedef enum H5F_mem_t H5FD_mem_t;
  */
 #define H5FD_FEAT_ALLOCATE_EARLY 0x00000200
 /*
- * Defining the H5FD_FEAT_ALLOW_FILE_IMAGE for a VFL driver means that
+ * Defining H5FD_FEAT_ALLOW_FILE_IMAGE for a VFL driver means that
  * the driver is able to use a file image in the fapl as the initial
  * contents of a file.
  */
 #define H5FD_FEAT_ALLOW_FILE_IMAGE 0x00000400
 /*
- * Defining the H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS for a VFL driver
+ * Defining H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS for a VFL driver
  * means that the driver is able to use callbacks to make a copy of the
  * image to store in memory.
  */
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index 13ced31..4c6b4d3 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -70,10 +70,11 @@ static hid_t H5FD_ROS3_g = 0;
 #define ROS3_STATS_START_POWER 10
 #define ROS3_STATS_BIN_COUNT   16 /* MUST BE GREATER THAN 0 */
 
-/*
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Calculate `BASE ^ (START_POWER + (INTERVAL * bin_i))`
  * Stores result at `(unsigned long long *) out_ptr`.
  * Used in computing boundaries between stats bins.
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
 #define ROS3_STATS_POW(bin_i, out_ptr)                                                                       \
     {                                                                                                        \
@@ -87,8 +88,7 @@ static hid_t H5FD_ROS3_g = 0;
         *(out_ptr) = donotshadowresult;                                                                      \
     }
 
-/* array to hold pre-computed boundaries for stats bins
- */
+/* array to hold pre-computed boundaries for stats bins */
 static unsigned long long ros3_stats_boundaries[ROS3_STATS_BIN_COUNT];
 
 /***************************************************************************
@@ -281,6 +281,8 @@ H5FL_DEFINE_STATIC(H5FD_ros3_t);
  * Return:      Success:    The driver ID for the ros3 driver.
  *              Failure:    Negative
  *
+ * Programmer:  Jacob Smith 2017
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -307,15 +309,15 @@ H5FD_ros3_init_interface(void)
 hid_t
 H5FD_ros3_init(void)
 {
-    hid_t ret_value = H5I_INVALID_HID;
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 #if ROS3_STATS
     unsigned int bin_i;
 #endif
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_init() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     if (H5I_VFL != H5I_get_type(H5FD_ROS3_g))
@@ -344,7 +346,7 @@ done:
  *
  * Purpose:     Shut down the VFD
  *
- * Returns:     SUCCEED (Can't fail)
+ * Returns:     <none>
  *
  * Programmer:  Jacob Smith 2017
  *
@@ -356,7 +358,7 @@ H5FD_ros3_term(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_term() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     /* Reset VFL ID */
@@ -392,7 +394,7 @@ H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa)
     HDassert(fa != NULL);
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5Pset_fapl_ros3() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
@@ -475,7 +477,7 @@ H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
     H5TRACE2("e", "i*x", fapl_id, fa_out);
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5Pget_fapl_ros3() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     if (fa_out == NULL)
@@ -635,7 +637,7 @@ ros3_reset_stats(H5FD_ros3_t *file)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDprintf("ros3_reset_stats() called\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     if (file == NULL)
@@ -703,7 +705,7 @@ H5FD_ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_open() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     /* Sanity check on file offsets */
@@ -1088,7 +1090,7 @@ H5FD_ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_close() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     /* Sanity checks */
@@ -1157,7 +1159,7 @@ H5FD_ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_cmp() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     HDassert(f1->s3r_handle != NULL);
@@ -1269,7 +1271,7 @@ H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_query() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     /* Set the VFL feature flags that this driver supports */
@@ -1309,7 +1311,7 @@ H5FD_ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_get_eoa() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(file->eoa)
@@ -1340,7 +1342,7 @@ H5FD_ros3_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_set_eoa() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     file->eoa = addr;
@@ -1374,7 +1376,7 @@ H5FD_ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_get_eof() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(H5FD_s3comms_s3r_get_filesize(file->s3r_handle))
@@ -1406,7 +1408,7 @@ H5FD_ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handl
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_get_handle() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     if (!file_handle)
@@ -1456,7 +1458,7 @@ H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_read() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     HDassert(file != NULL);
@@ -1526,7 +1528,7 @@ H5FD_ros3_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hi
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_write() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot write to read-only file.")
@@ -1563,7 +1565,7 @@ H5FD_ros3_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id, h
     FUNC_ENTER_NOAPI_NOINIT
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_truncate() called.\n");
+    HDfprintf(stdout, "called %s.\n", FUNC);
 #endif
 
     HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot truncate read-only file.")
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index d537587..54d7cbb 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -194,8 +194,8 @@ H5FD_sec2_init_interface(void)
  * Purpose:     Initialize this driver by registering the driver with the
  *              library.
  *
- * Return:      Success:    The driver ID for the sec2 driver.
- *              Failure:    Negative
+ * Return:      Success:    The driver ID for the sec2 driver
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
@@ -205,9 +205,9 @@ H5FD_sec2_init_interface(void)
 hid_t
 H5FD_sec2_init(void)
 {
-    hid_t ret_value; /* Return value */
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     if (H5I_VFL != H5I_get_type(H5FD_SEC2_g))
         H5FD_SEC2_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), FALSE);
@@ -299,7 +299,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
     h5_stat_t sb;
-    H5FD_t *  ret_value; /* Return value             */
+    H5FD_t *  ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -681,7 +681,6 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
      * and the end of the file.
      */
     while (size > 0) {
-
         h5_posix_io_t     bytes_in   = 0;  /* # of bytes to read       */
         h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
 
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 900f34e..051209b 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -17,7 +17,7 @@
  *			Jan  3 2008
  *			Quincey Koziol
  *
- * Purpose:		Space allocation routines for the file.
+ * Purpose:		Space allocation routines for the file driver code.
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 6290214..f78c823 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -436,7 +436,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     file->inode  = sb.st_ino;
 #endif /* H5_HAVE_WIN32_API */
 
-    return (H5FD_t *)file;
+    return ((H5FD_t *)file);
 } /* end H5FD_stdio_open() */
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5S.c b/src/H5S.c
index 8f3baca..b086be5 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -1482,12 +1482,12 @@ done:
 static H5S_t *
 H5S_decode(const unsigned char *buf)
 {
-    H5F_t *              f = NULL;         /* Fake file structure*/
-    H5S_t *              ds;               /* Decoded dataspace */
-    H5S_extent_t *       extent;           /* Entent of decoded dataspace */
-    size_t               extent_size;      /* size of the extent message*/
-    uint8_t              sizeof_size;      /* 'Size of sizes' for file */
-    H5S_t *              ret_value = NULL; /* Return value */
+    H5F_t *       f = NULL;         /* Fake file structure*/
+    H5S_t *       ds;               /* Decoded dataspace */
+    H5S_extent_t *extent;           /* Entent of decoded dataspace */
+    size_t        extent_size;      /* size of the extent message*/
+    uint8_t       sizeof_size;      /* 'Size of sizes' for file */
+    H5S_t *       ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 4fc116b..845bf61 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -1398,11 +1398,11 @@ H5S_get_select_type(const H5S_t *space)
 htri_t
 H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
 {
-    H5S_sel_iter_t iter_a;             /* Selection a iteration info */
-    H5S_sel_iter_t iter_b;             /* Selection b iteration info */
-    hbool_t         iter_a_init = FALSE; /* Selection a iteration info has been initialized */
-    hbool_t         iter_b_init = FALSE; /* Selection b iteration info has been initialized */
-    htri_t          ret_value   = TRUE;  /* Return value */
+    H5S_sel_iter_t iter_a;              /* Selection a iteration info */
+    H5S_sel_iter_t iter_b;              /* Selection b iteration info */
+    hbool_t        iter_a_init = FALSE; /* Selection a iteration info has been initialized */
+    hbool_t        iter_b_init = FALSE; /* Selection b iteration info has been initialized */
+    htri_t         ret_value   = TRUE;  /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1969,7 +1969,7 @@ herr_t
 H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *_buf)
 {
     H5S_sel_iter_t iter;                /* Selection iteration info */
-    hbool_t         iter_init = FALSE;   /* Selection iteration info has been initialized */
+    hbool_t        iter_init = FALSE;   /* Selection iteration info has been initialized */
     hssize_t       nelmts;              /* Number of elements in selection */
     size_t         max_elem;            /* Total number of elements in selection */
     herr_t         ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 907409f..a0fc720 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -537,7 +537,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
     H5G_loc_t  type_loc;                     /* Group object for datatype */
     hbool_t    obj_found = FALSE;            /* Object at 'name' found */
     hid_t      dxpl_id   = H5AC_ind_dxpl_id; /* dxpl to use to open datatype */
-    hid_t      ret_value = H5I_INVALID_HID;             /* Return value */
+    hid_t      ret_value = H5I_INVALID_HID;  /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE3("i", "i*si", loc_id, name, tapl_id);
@@ -616,11 +616,11 @@ done:
 hid_t
 H5Tget_create_plist(hid_t dtype_id)
 {
-    H5T_t *         type;               /* Datatype object for ID */
-    H5P_genplist_t *tcpl_plist;         /* Existing datatype creation propertty list */
-    hid_t           new_tcpl_id = FAIL; /* New datatype creation property list */
-    herr_t          status;             /* Generic status value */
-    hid_t           ret_value = H5I_INVALID_HID;          /* Return value */
+    H5T_t *         type;                        /* Datatype object for ID */
+    H5P_genplist_t *tcpl_plist;                  /* Existing datatype creation propertty list */
+    hid_t           new_tcpl_id = FAIL;          /* New datatype creation property list */
+    herr_t          status;                      /* Generic status value */
+    hid_t           ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE1("i", "i", dtype_id);
diff --git a/src/H5overflow.h b/src/H5overflow.h
index 54433c8..af21277 100644
--- a/src/H5overflow.h
+++ b/src/H5overflow.h
@@ -14,9 +14,11 @@
 /* Generated automatically by bin/make_overflow -- do not edit */
 /* Add new types to H5overflow.txt file */
 
+
 #ifndef _H5overflow_H
 #define _H5overflow_H
 
+
 /* Each type in this file is tested for assignment to the other types,
  *      and range checks are defined for bad assignments at run-time.
  */
@@ -25,2186 +27,2226 @@
 
 /* src: unsigned, dst: int8_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_INT8_T
-#define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_INT8_T
-#define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_INT8_T */
-#define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: int8_t */
 
 /* src: unsigned, dst: int */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_INT
-#define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_INT
-#define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_INT */
-#define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: int */
 
 /* src: unsigned, dst: uint8_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT8_T
-#define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT8_T
-#define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT8_T */
-#define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint8_t */
 
 /* src: unsigned, dst: uint16_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT16_T
-#define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT16_T
-#define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT16_T */
-#define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint16_t */
 
 /* src: unsigned, dst: uint32_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT32_T
-#define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT32_T
-#define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT32_T */
-#define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint32_t */
 
 /* src: unsigned, dst: uint64_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_UINT64_T
-#define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_UINT64_T
-#define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_UINT64_T */
-#define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: uint64_t */
 
 /* src: unsigned, dst: ptrdiff_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: ptrdiff_t */
 
 /* src: unsigned, dst: size_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_SIZE_T
-#define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_SIZE_T
-#define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_SIZE_T */
-#define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: size_t */
 
 /* src: unsigned, dst: ssize_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_SSIZE_T
-#define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_SSIZE_T
-#define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: ssize_t */
 
 /* src: unsigned, dst: haddr_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_HADDR_T
-#define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_HADDR_T
-#define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_HADDR_T */
-#define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: haddr_t */
 
 /* src: unsigned, dst: hsize_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_HSIZE_T
-#define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_HSIZE_T
-#define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: hsize_t */
 
 /* src: unsigned, dst: hssize_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: hssize_t */
 
 /* src: unsigned, dst: h5_stat_size_t */
 #if H5_SIZEOF_UNSIGNED < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UNSIGNED > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UNSIGNED == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_unsigned_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: unsigned dst: h5_stat_size_t */
 
+
 /* Assignment checks for int8_t */
 
 /* src: int8_t, dst: unsigned */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: unsigned */
 
 /* src: int8_t, dst: int */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_INT
-#define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_INT
-#define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_INT */
-#define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: int */
 
 /* src: int8_t, dst: uint8_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint8_t */
 
 /* src: int8_t, dst: uint16_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint16_t */
 
 /* src: int8_t, dst: uint32_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint32_t */
 
 /* src: int8_t, dst: uint64_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: uint64_t */
 
 /* src: int8_t, dst: ptrdiff_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: ptrdiff_t */
 
 /* src: int8_t, dst: size_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: size_t */
 
 /* src: int8_t, dst: ssize_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: ssize_t */
 
 /* src: int8_t, dst: haddr_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: haddr_t */
 
 /* src: int8_t, dst: hsize_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: hsize_t */
 
 /* src: int8_t, dst: hssize_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: hssize_t */
 
 /* src: int8_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_INT8_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT8_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT8_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int8_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for int */
 
 /* src: int, dst: unsigned */
 #if H5_SIZEOF_INT < H5_SIZEOF_UNSIGNED
-#define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UNSIGNED
-#define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: unsigned */
 
 /* src: int, dst: int8_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_INT8_T
-#define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_INT8_T
-#define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_INT8_T */
-#define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: int8_t */
 
 /* src: int, dst: uint8_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT8_T
-#define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT8_T
-#define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT8_T */
-#define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint8_t */
 
 /* src: int, dst: uint16_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT16_T
-#define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT16_T
-#define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT16_T */
-#define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint16_t */
 
 /* src: int, dst: uint32_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT32_T
-#define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT32_T
-#define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT32_T */
-#define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint32_t */
 
 /* src: int, dst: uint64_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_UINT64_T
-#define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_UINT64_T
-#define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_UINT64_T */
-#define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: uint64_t */
 
 /* src: int, dst: ptrdiff_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: ptrdiff_t */
 
 /* src: int, dst: size_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_SIZE_T
-#define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_SIZE_T
-#define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_SIZE_T */
-#define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: size_t */
 
 /* src: int, dst: ssize_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_SSIZE_T
-#define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_SSIZE_T
-#define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: ssize_t */
 
 /* src: int, dst: haddr_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_HADDR_T
-#define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_HADDR_T
-#define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_HADDR_T */
-#define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: haddr_t */
 
 /* src: int, dst: hsize_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_HSIZE_T
-#define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_HSIZE_T
-#define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: hsize_t */
 
 /* src: int, dst: hssize_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: hssize_t */
 
 /* src: int, dst: h5_stat_size_t */
 #if H5_SIZEOF_INT < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_INT > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_INT == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_int_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: int dst: h5_stat_size_t */
 
+
 /* Assignment checks for uint8_t */
 
 /* src: uint8_t, dst: unsigned */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: unsigned */
 
 /* src: uint8_t, dst: int8_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_INT8_T
-#define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_INT8_T
-#define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: int8_t */
 
 /* src: uint8_t, dst: int */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_INT
-#define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_INT
-#define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_INT */
-#define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: int */
 
 /* src: uint8_t, dst: uint16_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: uint16_t */
 
 /* src: uint8_t, dst: uint32_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: uint32_t */
 
 /* src: uint8_t, dst: uint64_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: uint64_t */
 
 /* src: uint8_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: ptrdiff_t */
 
 /* src: uint8_t, dst: size_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: size_t */
 
 /* src: uint8_t, dst: ssize_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: ssize_t */
 
 /* src: uint8_t, dst: haddr_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: haddr_t */
 
 /* src: uint8_t, dst: hsize_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: hsize_t */
 
 /* src: uint8_t, dst: hssize_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: hssize_t */
 
 /* src: uint8_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT8_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT8_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT8_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint8_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint8_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for uint16_t */
 
 /* src: uint16_t, dst: unsigned */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: unsigned */
 
 /* src: uint16_t, dst: int8_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_INT8_T
-#define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_INT8_T
-#define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: int8_t */
 
 /* src: uint16_t, dst: int */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_INT
-#define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_INT
-#define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_INT */
-#define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: int */
 
 /* src: uint16_t, dst: uint8_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: uint8_t */
 
 /* src: uint16_t, dst: uint32_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: uint32_t */
 
 /* src: uint16_t, dst: uint64_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: uint64_t */
 
 /* src: uint16_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: ptrdiff_t */
 
 /* src: uint16_t, dst: size_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: size_t */
 
 /* src: uint16_t, dst: ssize_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: ssize_t */
 
 /* src: uint16_t, dst: haddr_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: haddr_t */
 
 /* src: uint16_t, dst: hsize_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: hsize_t */
 
 /* src: uint16_t, dst: hssize_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: hssize_t */
 
 /* src: uint16_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT16_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT16_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT16_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint16_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint16_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for uint32_t */
 
 /* src: uint32_t, dst: unsigned */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: unsigned */
 
 /* src: uint32_t, dst: int8_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_INT8_T
-#define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_INT8_T
-#define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: int8_t */
 
 /* src: uint32_t, dst: int */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_INT
-#define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_INT
-#define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_INT */
-#define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: int */
 
 /* src: uint32_t, dst: uint8_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: uint8_t */
 
 /* src: uint32_t, dst: uint16_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: uint16_t */
 
 /* src: uint32_t, dst: uint64_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: uint64_t */
 
 /* src: uint32_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: ptrdiff_t */
 
 /* src: uint32_t, dst: size_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: size_t */
 
 /* src: uint32_t, dst: ssize_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: ssize_t */
 
 /* src: uint32_t, dst: haddr_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: haddr_t */
 
 /* src: uint32_t, dst: hsize_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: hsize_t */
 
 /* src: uint32_t, dst: hssize_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: hssize_t */
 
 /* src: uint32_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT32_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT32_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT32_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint32_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint32_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for uint64_t */
 
 /* src: uint64_t, dst: unsigned */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: unsigned */
 
 /* src: uint64_t, dst: int8_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_INT8_T
-#define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_INT8_T
-#define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: int8_t */
 
 /* src: uint64_t, dst: int */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_INT
-#define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_INT
-#define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_INT */
-#define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: int */
 
 /* src: uint64_t, dst: uint8_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: uint8_t */
 
 /* src: uint64_t, dst: uint16_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: uint16_t */
 
 /* src: uint64_t, dst: uint32_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: uint32_t */
 
 /* src: uint64_t, dst: ptrdiff_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: ptrdiff_t */
 
 /* src: uint64_t, dst: size_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: size_t */
 
 /* src: uint64_t, dst: ssize_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: ssize_t */
 
 /* src: uint64_t, dst: haddr_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: haddr_t */
 
 /* src: uint64_t, dst: hsize_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: hsize_t */
 
 /* src: uint64_t, dst: hssize_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: hssize_t */
 
 /* src: uint64_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_UINT64_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_UINT64_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_UINT64_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_uint64_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: uint64_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for ptrdiff_t */
 
 /* src: ptrdiff_t, dst: unsigned */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: unsigned */
 
 /* src: ptrdiff_t, dst: int8_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_INT8_T
-#define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_INT8_T
-#define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: int8_t */
 
 /* src: ptrdiff_t, dst: int */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_INT
-#define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_INT
-#define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_INT */
-#define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: int */
 
 /* src: ptrdiff_t, dst: uint8_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint8_t */
 
 /* src: ptrdiff_t, dst: uint16_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint16_t */
 
 /* src: ptrdiff_t, dst: uint32_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint32_t */
 
 /* src: ptrdiff_t, dst: uint64_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: uint64_t */
 
 /* src: ptrdiff_t, dst: size_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: size_t */
 
 /* src: ptrdiff_t, dst: ssize_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: ssize_t */
 
 /* src: ptrdiff_t, dst: haddr_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: haddr_t */
 
 /* src: ptrdiff_t, dst: hsize_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: hsize_t */
 
 /* src: ptrdiff_t, dst: hssize_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: hssize_t */
 
 /* src: ptrdiff_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_PTRDIFF_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                       \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_PTRDIFF_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                       \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_PTRDIFF_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                       \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ptrdiff_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ptrdiff_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for size_t */
 
 /* src: size_t, dst: unsigned */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: unsigned */
 
 /* src: size_t, dst: int8_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_INT8_T
-#define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_INT8_T
-#define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype)                                                  \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: int8_t */
 
 /* src: size_t, dst: int */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_INT
-#define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_INT
-#define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_INT */
-#define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype)                                                     \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: int */
 
 /* src: size_t, dst: uint8_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint8_t */
 
 /* src: size_t, dst: uint16_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint16_t */
 
 /* src: size_t, dst: uint32_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint32_t */
 
 /* src: size_t, dst: uint64_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: uint64_t */
 
 /* src: size_t, dst: ptrdiff_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: ptrdiff_t */
 
 /* src: size_t, dst: ssize_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: ssize_t */
 
 /* src: size_t, dst: haddr_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: haddr_t */
 
 /* src: size_t, dst: hsize_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: hsize_t */
 
 /* src: size_t, dst: hssize_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: hssize_t */
 
 /* src: size_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_SIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_size_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: size_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for ssize_t */
 
 /* src: ssize_t, dst: unsigned */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: unsigned */
 
 /* src: ssize_t, dst: int8_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_INT8_T
-#define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_INT8_T
-#define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: int8_t */
 
 /* src: ssize_t, dst: int */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_INT
-#define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_INT
-#define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_INT */
-#define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: int */
 
 /* src: ssize_t, dst: uint8_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint8_t */
 
 /* src: ssize_t, dst: uint16_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint16_t */
 
 /* src: ssize_t, dst: uint32_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint32_t */
 
 /* src: ssize_t, dst: uint64_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: uint64_t */
 
 /* src: ssize_t, dst: ptrdiff_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: ptrdiff_t */
 
 /* src: ssize_t, dst: size_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: size_t */
 
 /* src: ssize_t, dst: haddr_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: haddr_t */
 
 /* src: ssize_t, dst: hsize_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: hsize_t */
 
 /* src: ssize_t, dst: hssize_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: hssize_t */
 
 /* src: ssize_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_SSIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_SSIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_SSIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_ssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: ssize_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for haddr_t */
 
 /* src: haddr_t, dst: unsigned */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: unsigned */
 
 /* src: haddr_t, dst: int8_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_INT8_T
-#define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_INT8_T
-#define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: int8_t */
 
 /* src: haddr_t, dst: int */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_INT
-#define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_INT
-#define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_INT */
-#define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: int */
 
 /* src: haddr_t, dst: uint8_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint8_t */
 
 /* src: haddr_t, dst: uint16_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint16_t */
 
 /* src: haddr_t, dst: uint32_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint32_t */
 
 /* src: haddr_t, dst: uint64_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: uint64_t */
 
 /* src: haddr_t, dst: ptrdiff_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: ptrdiff_t */
 
 /* src: haddr_t, dst: size_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: size_t */
 
 /* src: haddr_t, dst: ssize_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: ssize_t */
 
 /* src: haddr_t, dst: hsize_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: hsize_t */
 
 /* src: haddr_t, dst: hssize_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: hssize_t */
 
 /* src: haddr_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_HADDR_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HADDR_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HADDR_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_haddr_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: haddr_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for hsize_t */
 
 /* src: hsize_t, dst: unsigned */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: unsigned */
 
 /* src: hsize_t, dst: int8_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_INT8_T
-#define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_INT8_T
-#define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: int8_t */
 
 /* src: hsize_t, dst: int */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_INT
-#define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_INT
-#define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_INT */
-#define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype)                                                    \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: int */
 
 /* src: hsize_t, dst: uint8_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint8_t */
 
 /* src: hsize_t, dst: uint16_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint16_t */
 
 /* src: hsize_t, dst: uint32_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint32_t */
 
 /* src: hsize_t, dst: uint64_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: uint64_t */
 
 /* src: hsize_t, dst: ptrdiff_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: ptrdiff_t */
 
 /* src: hsize_t, dst: size_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype)                                                 \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: size_t */
 
 /* src: hsize_t, dst: ssize_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: ssize_t */
 
 /* src: hsize_t, dst: haddr_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: haddr_t */
 
 /* src: hsize_t, dst: hssize_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: hssize_t */
 
 /* src: hsize_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_HSIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hsize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hsize_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for hssize_t */
 
 /* src: hssize_t, dst: unsigned */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: unsigned */
 
 /* src: hssize_t, dst: int8_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_INT8_T
-#define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_INT8_T
-#define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: int8_t */
 
 /* src: hssize_t, dst: int */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_INT
-#define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_INT
-#define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_INT */
-#define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype)                                                   \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: int */
 
 /* src: hssize_t, dst: uint8_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint8_t */
 
 /* src: hssize_t, dst: uint16_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint16_t */
 
 /* src: hssize_t, dst: uint32_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint32_t */
 
 /* src: hssize_t, dst: uint64_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype)                                              \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: uint64_t */
 
 /* src: hssize_t, dst: ptrdiff_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: ptrdiff_t */
 
 /* src: hssize_t, dst: size_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype)                                                \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: size_t */
 
 /* src: hssize_t, dst: ssize_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: ssize_t */
 
 /* src: hssize_t, dst: haddr_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: haddr_t */
 
 /* src: hssize_t, dst: hsize_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype)                                               \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: hsize_t */
 
 /* src: hssize_t, dst: h5_stat_size_t */
 #if H5_SIZEOF_HSSIZE_T < H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_HSSIZE_T > H5_SIZEOF_H5_STAT_SIZE_T
-#define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_HSSIZE_T == H5_SIZEOF_H5_STAT_SIZE_T */
-#define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_hssize_t_TO_h5_stat_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SIGNED_TO_UNSIGNED(dst, dsttype, src, srctype)
 #endif /* src: hssize_t dst: h5_stat_size_t */
 
+
 /* Assignment checks for h5_stat_size_t */
 
 /* src: h5_stat_size_t, dst: unsigned */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UNSIGNED
-#define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UNSIGNED
-#define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UNSIGNED */
-#define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_unsigned(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: unsigned */
 
 /* src: h5_stat_size_t, dst: int8_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_INT8_T
-#define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_INT8_T
-#define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_INT8_T */
-#define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_int8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: int8_t */
 
 /* src: h5_stat_size_t, dst: int */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_INT
-#define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_INT
-#define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_INT */
-#define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype)                                             \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_int(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: int */
 
 /* src: h5_stat_size_t, dst: uint8_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT8_T
-#define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT8_T
-#define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT8_T */
-#define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint8_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint8_t */
 
 /* src: h5_stat_size_t, dst: uint16_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT16_T
-#define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT16_T
-#define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT16_T */
-#define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint16_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint16_t */
 
 /* src: h5_stat_size_t, dst: uint32_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT32_T
-#define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT32_T
-#define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT32_T */
-#define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint32_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint32_t */
 
 /* src: h5_stat_size_t, dst: uint64_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_UINT64_T
-#define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_UINT64_T
-#define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_UINT64_T */
-#define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_uint64_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: uint64_t */
 
 /* src: h5_stat_size_t, dst: ptrdiff_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                       \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_PTRDIFF_T
-#define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                       \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_PTRDIFF_T */
-#define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype)                                       \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_ptrdiff_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: ptrdiff_t */
 
 /* src: h5_stat_size_t, dst: size_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_SIZE_T
-#define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_SIZE_T
-#define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_SIZE_T */
-#define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype)                                          \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_size_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: size_t */
 
 /* src: h5_stat_size_t, dst: ssize_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_SSIZE_T
-#define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_SSIZE_T
-#define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_SSIZE_T */
-#define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_ssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: ssize_t */
 
 /* src: h5_stat_size_t, dst: haddr_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_HADDR_T
-#define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_HADDR_T
-#define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_HADDR_T */
-#define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_haddr_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: haddr_t */
 
 /* src: h5_stat_size_t, dst: hsize_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_HSIZE_T
-#define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_HSIZE_T
-#define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_HSIZE_T */
-#define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype)                                         \
-    ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_hsize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_SAME_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: hsize_t */
 
 /* src: h5_stat_size_t, dst: hssize_t */
 #if H5_SIZEOF_H5_STAT_SIZE_T < H5_SIZEOF_HSSIZE_T
-#define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_LARGER_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #elif H5_SIZEOF_H5_STAT_SIZE_T > H5_SIZEOF_HSSIZE_T
-#define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SMALLER_SIZE(dst, dsttype, src, srctype)
 #else /* H5_SIZEOF_H5_STAT_SIZE_T == H5_SIZEOF_HSSIZE_T */
-#define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype)                                        \
-    ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
+    #define ASSIGN_h5_stat_size_t_TO_hssize_t(dst, dsttype, src, srctype) \
+        ASSIGN_TO_SAME_SIZE_UNSIGNED_TO_SIGNED(dst, dsttype, src, srctype)
 #endif /* src: h5_stat_size_t dst: hssize_t */
 
 #endif /* H5overflow_H */
+
diff --git a/src/H5public.h b/src/H5public.h
index a98af42..01c7854 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -223,11 +223,11 @@ typedef unsigned long long haddr_t;
  */
 #if H5_SIZEOF_UINT32_T >= 4
 #elif H5_SIZEOF_SHORT >= 4
-typedef short         uint32_t;
+typedef short    uint32_t;
 #undef H5_SIZEOF_UINT32_T
 #define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
 #elif H5_SIZEOF_INT >= 4
-typedef unsigned int       uint32_t;
+typedef unsigned int  uint32_t;
 #undef H5_SIZEOF_UINT32_T
 #define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
 #elif H5_SIZEOF_LONG >= 4
@@ -243,11 +243,11 @@ typedef unsigned long      uint32_t;
  */
 #if H5_SIZEOF_INT64_T >= 8
 #elif H5_SIZEOF_INT >= 8
-typedef int           int64_t;
+typedef int      int64_t;
 #undef H5_SIZEOF_INT64_T
 #define H5_SIZEOF_INT64_T H5_SIZEOF_INT
 #elif H5_SIZEOF_LONG >= 8
-typedef long               int64_t;
+typedef long          int64_t;
 #undef H5_SIZEOF_INT64_T
 #define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
 #elif H5_SIZEOF_LONG_LONG >= 8
@@ -263,11 +263,11 @@ typedef long long          int64_t;
  */
 #if H5_SIZEOF_UINT64_T >= 8
 #elif H5_SIZEOF_INT >= 8
-typedef unsigned      uint64_t;
+typedef unsigned uint64_t;
 #undef H5_SIZEOF_UINT64_T
 #define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
 #elif H5_SIZEOF_LONG >= 8
-typedef unsigned long      uint64_t;
+typedef unsigned long uint64_t;
 #undef H5_SIZEOF_UINT64_T
 #define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
 #elif H5_SIZEOF_LONG_LONG >= 8
diff --git a/src/H5timer.c b/src/H5timer.c
index 09f085d..2c94aed 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -252,7 +252,7 @@ H5_now(void)
         now = now_tv.tv_sec;
     }
 #else  /* H5_HAVE_GETTIMEOFDAY */
-    now = HDtime(NULL);
+    now          = HDtime(NULL);
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
     return (now);
diff --git a/src/H5version.h b/src/H5version.h
index 5f35b99..71044dd 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -14,6 +14,7 @@
 /* Generated automatically by bin/make_vers -- do not edit */
 /* Add new versioned symbols to H5vers.txt file */
 
+
 #ifndef _H5version_H
 #define _H5version_H
 
@@ -22,6 +23,7 @@
 #error "Can't choose old API versions when deprecated APIs are disabled"
 #endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */
 
+
 /* If a particular "global" version of the library's interfaces is chosen,
  *      set the versions for the API symbols affected.
  *
@@ -136,6 +138,7 @@
 
 #endif /* H5_USE_16_API */
 
+
 /* Choose the correct version of each API symbol, defaulting to the latest
  *      version of each.  The "best" name for API parameters/data structures
  *      that have changed definitions is also set.  An error is issued for
@@ -161,10 +164,10 @@
 #ifndef H5Aiterate_vers
 #define H5Aiterate_vers 2
 #endif /* H5Aiterate_vers */
-#define H5Aiterate     H5Aiterate2
+#define H5Aiterate H5Aiterate2
 #define H5A_operator_t H5A_operator2_t
 #elif H5Aiterate_vers == 1
-#define H5Aiterate     H5Aiterate1
+#define H5Aiterate H5Aiterate1
 #define H5A_operator_t H5A_operator1_t
 #else /* H5Aiterate_vers */
 #error "H5Aiterate_vers set to invalid value"
@@ -251,13 +254,13 @@
 #ifndef H5Ewalk_vers
 #define H5Ewalk_vers 2
 #endif /* H5Ewalk_vers */
-#define H5Ewalk     H5Ewalk2
+#define H5Ewalk H5Ewalk2
 #define H5E_error_t H5E_error2_t
-#define H5E_walk_t  H5E_walk2_t
+#define H5E_walk_t H5E_walk2_t
 #elif H5Ewalk_vers == 1
-#define H5Ewalk     H5Ewalk1
+#define H5Ewalk H5Ewalk1
 #define H5E_error_t H5E_error1_t
-#define H5E_walk_t  H5E_walk1_t
+#define H5E_walk_t H5E_walk1_t
 #else /* H5Ewalk_vers */
 #error "H5Ewalk_vers set to invalid value"
 #endif /* H5Ewalk_vers */
@@ -398,6 +401,7 @@
 #error "H5E_auto_t_vers set to invalid value"
 #endif /* H5E_auto_t_vers */
 
+
 #if !defined(H5Z_class_t_vers) || H5Z_class_t_vers == 2
 #ifndef H5Z_class_t_vers
 #define H5Z_class_t_vers 2
@@ -410,3 +414,4 @@
 #endif /* H5Z_class_t_vers */
 
 #endif /* H5version_H */
+
diff --git a/src/Makefile.in b/src/Makefile.in
index 16a4148..c46fac5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -114,7 +114,10 @@ TESTS =
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
-	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
@@ -123,6 +126,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
 CONFIG_HEADER = H5config.h
 CONFIG_CLEAN_FILES = libhdf5.settings
 CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -255,7 +259,6 @@ am__v_lt_1 =
 libhdf5_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libhdf5_la_LDFLAGS) $(LDFLAGS) -o $@
-PROGRAMS = $(noinst_PROGRAMS)
 H5detect_SOURCES = H5detect.c
 H5detect_OBJECTS = H5detect.$(OBJEXT)
 H5detect_LDADD = $(LDADD)
@@ -276,7 +279,129 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/H5.Plo ./$(DEPDIR)/H5A.Plo \
+	./$(DEPDIR)/H5AC.Plo ./$(DEPDIR)/H5Abtree2.Plo \
+	./$(DEPDIR)/H5Adense.Plo ./$(DEPDIR)/H5Adeprec.Plo \
+	./$(DEPDIR)/H5Aint.Plo ./$(DEPDIR)/H5Atest.Plo \
+	./$(DEPDIR)/H5B.Plo ./$(DEPDIR)/H5B2.Plo \
+	./$(DEPDIR)/H5B2cache.Plo ./$(DEPDIR)/H5B2dbg.Plo \
+	./$(DEPDIR)/H5B2hdr.Plo ./$(DEPDIR)/H5B2int.Plo \
+	./$(DEPDIR)/H5B2stat.Plo ./$(DEPDIR)/H5B2test.Plo \
+	./$(DEPDIR)/H5Bcache.Plo ./$(DEPDIR)/H5Bdbg.Plo \
+	./$(DEPDIR)/H5C.Plo ./$(DEPDIR)/H5CS.Plo ./$(DEPDIR)/H5D.Plo \
+	./$(DEPDIR)/H5Dbtree.Plo ./$(DEPDIR)/H5Dchunk.Plo \
+	./$(DEPDIR)/H5Dcompact.Plo ./$(DEPDIR)/H5Dcontig.Plo \
+	./$(DEPDIR)/H5Ddbg.Plo ./$(DEPDIR)/H5Ddeprec.Plo \
+	./$(DEPDIR)/H5Defl.Plo ./$(DEPDIR)/H5Dfill.Plo \
+	./$(DEPDIR)/H5Dint.Plo ./$(DEPDIR)/H5Dio.Plo \
+	./$(DEPDIR)/H5Dlayout.Plo ./$(DEPDIR)/H5Dmpio.Plo \
+	./$(DEPDIR)/H5Doh.Plo ./$(DEPDIR)/H5Dscatgath.Plo \
+	./$(DEPDIR)/H5Dselect.Plo ./$(DEPDIR)/H5Dtest.Plo \
+	./$(DEPDIR)/H5E.Plo ./$(DEPDIR)/H5Edeprec.Plo \
+	./$(DEPDIR)/H5Eint.Plo ./$(DEPDIR)/H5F.Plo \
+	./$(DEPDIR)/H5FD.Plo ./$(DEPDIR)/H5FDcore.Plo \
+	./$(DEPDIR)/H5FDdirect.Plo ./$(DEPDIR)/H5FDfamily.Plo \
+	./$(DEPDIR)/H5FDhdfs.Plo ./$(DEPDIR)/H5FDint.Plo \
+	./$(DEPDIR)/H5FDlog.Plo ./$(DEPDIR)/H5FDmpi.Plo \
+	./$(DEPDIR)/H5FDmpio.Plo ./$(DEPDIR)/H5FDmulti.Plo \
+	./$(DEPDIR)/H5FDros3.Plo ./$(DEPDIR)/H5FDs3comms.Plo \
+	./$(DEPDIR)/H5FDsec2.Plo ./$(DEPDIR)/H5FDspace.Plo \
+	./$(DEPDIR)/H5FDstdio.Plo ./$(DEPDIR)/H5FL.Plo \
+	./$(DEPDIR)/H5FO.Plo ./$(DEPDIR)/H5FS.Plo \
+	./$(DEPDIR)/H5FScache.Plo ./$(DEPDIR)/H5FSdbg.Plo \
+	./$(DEPDIR)/H5FSsection.Plo ./$(DEPDIR)/H5FSstat.Plo \
+	./$(DEPDIR)/H5FStest.Plo ./$(DEPDIR)/H5Faccum.Plo \
+	./$(DEPDIR)/H5Fcwfs.Plo ./$(DEPDIR)/H5Fdbg.Plo \
+	./$(DEPDIR)/H5Fefc.Plo ./$(DEPDIR)/H5Ffake.Plo \
+	./$(DEPDIR)/H5Fint.Plo ./$(DEPDIR)/H5Fio.Plo \
+	./$(DEPDIR)/H5Fmount.Plo ./$(DEPDIR)/H5Fmpi.Plo \
+	./$(DEPDIR)/H5Fquery.Plo ./$(DEPDIR)/H5Fsfile.Plo \
+	./$(DEPDIR)/H5Fsuper.Plo ./$(DEPDIR)/H5Fsuper_cache.Plo \
+	./$(DEPDIR)/H5Ftest.Plo ./$(DEPDIR)/H5G.Plo \
+	./$(DEPDIR)/H5Gbtree2.Plo ./$(DEPDIR)/H5Gcache.Plo \
+	./$(DEPDIR)/H5Gcompact.Plo ./$(DEPDIR)/H5Gdense.Plo \
+	./$(DEPDIR)/H5Gdeprec.Plo ./$(DEPDIR)/H5Gent.Plo \
+	./$(DEPDIR)/H5Gint.Plo ./$(DEPDIR)/H5Glink.Plo \
+	./$(DEPDIR)/H5Gloc.Plo ./$(DEPDIR)/H5Gname.Plo \
+	./$(DEPDIR)/H5Gnode.Plo ./$(DEPDIR)/H5Gobj.Plo \
+	./$(DEPDIR)/H5Goh.Plo ./$(DEPDIR)/H5Groot.Plo \
+	./$(DEPDIR)/H5Gstab.Plo ./$(DEPDIR)/H5Gtest.Plo \
+	./$(DEPDIR)/H5Gtraverse.Plo ./$(DEPDIR)/H5HF.Plo \
+	./$(DEPDIR)/H5HFbtree2.Plo ./$(DEPDIR)/H5HFcache.Plo \
+	./$(DEPDIR)/H5HFdbg.Plo ./$(DEPDIR)/H5HFdblock.Plo \
+	./$(DEPDIR)/H5HFdtable.Plo ./$(DEPDIR)/H5HFhdr.Plo \
+	./$(DEPDIR)/H5HFhuge.Plo ./$(DEPDIR)/H5HFiblock.Plo \
+	./$(DEPDIR)/H5HFiter.Plo ./$(DEPDIR)/H5HFman.Plo \
+	./$(DEPDIR)/H5HFsection.Plo ./$(DEPDIR)/H5HFspace.Plo \
+	./$(DEPDIR)/H5HFstat.Plo ./$(DEPDIR)/H5HFtest.Plo \
+	./$(DEPDIR)/H5HFtiny.Plo ./$(DEPDIR)/H5HG.Plo \
+	./$(DEPDIR)/H5HGcache.Plo ./$(DEPDIR)/H5HGdbg.Plo \
+	./$(DEPDIR)/H5HGquery.Plo ./$(DEPDIR)/H5HL.Plo \
+	./$(DEPDIR)/H5HLcache.Plo ./$(DEPDIR)/H5HLdbg.Plo \
+	./$(DEPDIR)/H5HLint.Plo ./$(DEPDIR)/H5HP.Plo \
+	./$(DEPDIR)/H5I.Plo ./$(DEPDIR)/H5Itest.Plo \
+	./$(DEPDIR)/H5L.Plo ./$(DEPDIR)/H5Lexternal.Plo \
+	./$(DEPDIR)/H5MF.Plo ./$(DEPDIR)/H5MFaggr.Plo \
+	./$(DEPDIR)/H5MFdbg.Plo ./$(DEPDIR)/H5MFsection.Plo \
+	./$(DEPDIR)/H5MM.Plo ./$(DEPDIR)/H5MP.Plo \
+	./$(DEPDIR)/H5MPtest.Plo ./$(DEPDIR)/H5O.Plo \
+	./$(DEPDIR)/H5Oainfo.Plo ./$(DEPDIR)/H5Oalloc.Plo \
+	./$(DEPDIR)/H5Oattr.Plo ./$(DEPDIR)/H5Oattribute.Plo \
+	./$(DEPDIR)/H5Obogus.Plo ./$(DEPDIR)/H5Obtreek.Plo \
+	./$(DEPDIR)/H5Ocache.Plo ./$(DEPDIR)/H5Ochunk.Plo \
+	./$(DEPDIR)/H5Ocont.Plo ./$(DEPDIR)/H5Ocopy.Plo \
+	./$(DEPDIR)/H5Odbg.Plo ./$(DEPDIR)/H5Odrvinfo.Plo \
+	./$(DEPDIR)/H5Odtype.Plo ./$(DEPDIR)/H5Oefl.Plo \
+	./$(DEPDIR)/H5Ofill.Plo ./$(DEPDIR)/H5Oginfo.Plo \
+	./$(DEPDIR)/H5Olayout.Plo ./$(DEPDIR)/H5Olinfo.Plo \
+	./$(DEPDIR)/H5Olink.Plo ./$(DEPDIR)/H5Omessage.Plo \
+	./$(DEPDIR)/H5Omtime.Plo ./$(DEPDIR)/H5Oname.Plo \
+	./$(DEPDIR)/H5Onull.Plo ./$(DEPDIR)/H5Opline.Plo \
+	./$(DEPDIR)/H5Orefcount.Plo ./$(DEPDIR)/H5Osdspace.Plo \
+	./$(DEPDIR)/H5Oshared.Plo ./$(DEPDIR)/H5Oshmesg.Plo \
+	./$(DEPDIR)/H5Ostab.Plo ./$(DEPDIR)/H5Otest.Plo \
+	./$(DEPDIR)/H5Ounknown.Plo ./$(DEPDIR)/H5P.Plo \
+	./$(DEPDIR)/H5PL.Plo ./$(DEPDIR)/H5Pacpl.Plo \
+	./$(DEPDIR)/H5Pdapl.Plo ./$(DEPDIR)/H5Pdcpl.Plo \
+	./$(DEPDIR)/H5Pdeprec.Plo ./$(DEPDIR)/H5Pdxpl.Plo \
+	./$(DEPDIR)/H5Pfapl.Plo ./$(DEPDIR)/H5Pfcpl.Plo \
+	./$(DEPDIR)/H5Pfmpl.Plo ./$(DEPDIR)/H5Pgcpl.Plo \
+	./$(DEPDIR)/H5Pint.Plo ./$(DEPDIR)/H5Plapl.Plo \
+	./$(DEPDIR)/H5Plcpl.Plo ./$(DEPDIR)/H5Pocpl.Plo \
+	./$(DEPDIR)/H5Pocpypl.Plo ./$(DEPDIR)/H5Pstrcpl.Plo \
+	./$(DEPDIR)/H5Ptest.Plo ./$(DEPDIR)/H5R.Plo \
+	./$(DEPDIR)/H5RC.Plo ./$(DEPDIR)/H5RS.Plo \
+	./$(DEPDIR)/H5Rdeprec.Plo ./$(DEPDIR)/H5S.Plo \
+	./$(DEPDIR)/H5SL.Plo ./$(DEPDIR)/H5SM.Plo \
+	./$(DEPDIR)/H5SMbtree2.Plo ./$(DEPDIR)/H5SMcache.Plo \
+	./$(DEPDIR)/H5SMmessage.Plo ./$(DEPDIR)/H5SMtest.Plo \
+	./$(DEPDIR)/H5ST.Plo ./$(DEPDIR)/H5Sall.Plo \
+	./$(DEPDIR)/H5Sdbg.Plo ./$(DEPDIR)/H5Shyper.Plo \
+	./$(DEPDIR)/H5Smpio.Plo ./$(DEPDIR)/H5Snone.Plo \
+	./$(DEPDIR)/H5Spoint.Plo ./$(DEPDIR)/H5Sselect.Plo \
+	./$(DEPDIR)/H5Stest.Plo ./$(DEPDIR)/H5T.Plo \
+	./$(DEPDIR)/H5TS.Plo ./$(DEPDIR)/H5Tarray.Plo \
+	./$(DEPDIR)/H5Tbit.Plo ./$(DEPDIR)/H5Tcommit.Plo \
+	./$(DEPDIR)/H5Tcompound.Plo ./$(DEPDIR)/H5Tconv.Plo \
+	./$(DEPDIR)/H5Tcset.Plo ./$(DEPDIR)/H5Tdbg.Plo \
+	./$(DEPDIR)/H5Tdeprec.Plo ./$(DEPDIR)/H5Tenum.Plo \
+	./$(DEPDIR)/H5Tfields.Plo ./$(DEPDIR)/H5Tfixed.Plo \
+	./$(DEPDIR)/H5Tfloat.Plo ./$(DEPDIR)/H5Tinit.Plo \
+	./$(DEPDIR)/H5Tnative.Plo ./$(DEPDIR)/H5Toffset.Plo \
+	./$(DEPDIR)/H5Toh.Plo ./$(DEPDIR)/H5Topaque.Plo \
+	./$(DEPDIR)/H5Torder.Plo ./$(DEPDIR)/H5Tpad.Plo \
+	./$(DEPDIR)/H5Tprecis.Plo ./$(DEPDIR)/H5Tstrpad.Plo \
+	./$(DEPDIR)/H5Tvisit.Plo ./$(DEPDIR)/H5Tvlen.Plo \
+	./$(DEPDIR)/H5VM.Plo ./$(DEPDIR)/H5WB.Plo ./$(DEPDIR)/H5Z.Plo \
+	./$(DEPDIR)/H5Zdeflate.Plo ./$(DEPDIR)/H5Zfletcher32.Plo \
+	./$(DEPDIR)/H5Znbit.Plo ./$(DEPDIR)/H5Zscaleoffset.Plo \
+	./$(DEPDIR)/H5Zshuffle.Plo ./$(DEPDIR)/H5Zszip.Plo \
+	./$(DEPDIR)/H5Ztrans.Plo ./$(DEPDIR)/H5checksum.Plo \
+	./$(DEPDIR)/H5dbg.Plo ./$(DEPDIR)/H5detect.Po \
+	./$(DEPDIR)/H5lib_settings.Plo \
+	./$(DEPDIR)/H5make_libsettings.Po ./$(DEPDIR)/H5system.Plo \
+	./$(DEPDIR)/H5timer.Plo ./$(DEPDIR)/H5trace.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -932,8 +1057,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 $(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am $(am__empty):
 
@@ -963,6 +1088,15 @@ distclean-hdr:
 libhdf5.settings: $(top_builddir)/config.status $(srcdir)/libhdf5.settings.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -1001,15 +1135,6 @@ clean-libLTLIBRARIES:
 libhdf5.la: $(libhdf5_la_OBJECTS) $(libhdf5_la_DEPENDENCIES) $(EXTRA_libhdf5_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libhdf5_la_LINK) -rpath $(libdir) $(libhdf5_la_OBJECTS) $(libhdf5_la_LIBADD) $(LIBS)
 
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
 H5detect$(EXEEXT): $(H5detect_OBJECTS) $(H5detect_DEPENDENCIES) $(EXTRA_H5detect_DEPENDENCIES) 
 	@rm -f H5detect$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(H5detect_OBJECTS) $(H5detect_LDADD) $(LIBS)
@@ -1024,251 +1149,257 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5A.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Abtree2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adense.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Aint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Atest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2dbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2hdr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2int.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2stat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2test.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dbtree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dchunk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcontig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ddbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ddeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Defl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dfill.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dlayout.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dmpio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Doh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dscatgath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dselect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5E.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Edeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Eint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5F.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FD.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDcore.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDdirect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDfamily.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDhdfs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDlog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmulti.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDros3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDs3comms.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsec2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDspace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstdio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FL.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FO.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FScache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSsection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSstat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FStest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Faccum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fcwfs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fefc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ffake.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fmount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fmpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fquery.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsfile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsuper.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsuper_cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ftest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5G.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gbtree2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gcompact.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gdense.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gdeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Glink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gname.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gnode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gobj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Goh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Groot.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gstab.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gtraverse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HF.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFbtree2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFdblock.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFdtable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFhdr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFhuge.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFiblock.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFiter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFsection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFspace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFstat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFtiny.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HG.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HGcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HGdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HGquery.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HL.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HLcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HLdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HLint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HP.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5I.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Itest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5L.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Lexternal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MF.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MFaggr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MFdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MFsection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MM.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MP.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MPtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5O.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oainfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oalloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oattr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oattribute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Obogus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Obtreek.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ocache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ochunk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ocont.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ocopy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Odbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Odrvinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Odtype.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oefl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ofill.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oginfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Olayout.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Olinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Olink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Omessage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Omtime.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oname.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Onull.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Opline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Orefcount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Osdspace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oshared.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oshmesg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ostab.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Otest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ounknown.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5P.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PL.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pacpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdapl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdcpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdxpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pfapl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pfcpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pfmpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pgcpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Plapl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Plcpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pocpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pocpypl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pstrcpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ptest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5R.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5RC.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5RS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Rdeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5S.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SL.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SM.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMbtree2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMmessage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5ST.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sall.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Shyper.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Smpio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Snone.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Spoint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sselect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Stest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5T.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5TS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tarray.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tbit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tcommit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tcompound.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tconv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tcset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tdeprec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tenum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tfields.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tfixed.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tfloat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tinit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tnative.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Toffset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Toh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Topaque.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Torder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tpad.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tprecis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tstrpad.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tvisit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tvlen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5VM.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5WB.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Z.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zdeflate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zfletcher32.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Znbit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zscaleoffset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zshuffle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zszip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ztrans.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5checksum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5dbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5detect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5lib_settings.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5make_libsettings.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5system.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5trace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5A.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Abtree2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adense.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Aint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Atest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2cache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2dbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2hdr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2int.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2stat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2test.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bcache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CS.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dbtree.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dchunk.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcontig.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ddbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ddeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Defl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dfill.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dlayout.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dmpio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Doh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dscatgath.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dselect.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dtest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5E.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Edeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Eint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5F.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FD.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDcore.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDdirect.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDfamily.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDhdfs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDlog.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmulti.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDros3.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDs3comms.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsec2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDspace.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstdio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FL.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FO.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FS.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FScache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSsection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSstat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FStest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Faccum.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fcwfs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fefc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ffake.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fmount.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fmpi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fquery.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsfile.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsuper.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsuper_cache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ftest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5G.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gbtree2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gcache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gcompact.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gdense.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gdeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gent.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Glink.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gname.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gnode.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gobj.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Goh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Groot.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gstab.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gtest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gtraverse.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HF.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFbtree2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFcache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFdblock.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFdtable.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFhdr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFhuge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFiblock.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFiter.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFman.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFsection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFspace.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFstat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFtest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HFtiny.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HG.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HGcache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HGdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HGquery.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HL.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HLcache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HLdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HLint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HP.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5I.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Itest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5L.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Lexternal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MF.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MFaggr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MFdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MFsection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MM.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MP.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5MPtest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5O.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oainfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oalloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oattr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oattribute.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Obogus.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Obtreek.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ocache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ochunk.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ocont.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ocopy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Odbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Odrvinfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Odtype.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oefl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ofill.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oginfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Olayout.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Olinfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Olink.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Omessage.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Omtime.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oname.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Onull.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Opline.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Orefcount.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Osdspace.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oshared.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Oshmesg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ostab.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Otest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ounknown.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5P.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PL.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pacpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdapl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdcpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pdxpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pfapl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pfcpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pfmpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pgcpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Plapl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Plcpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pocpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pocpypl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pstrcpl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ptest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5R.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5RC.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5RS.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Rdeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5S.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SL.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SM.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMbtree2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMcache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMmessage.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SMtest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5ST.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sall.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Shyper.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Smpio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Snone.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Spoint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sselect.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Stest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5T.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5TS.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tarray.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tbit.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tcommit.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tcompound.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tconv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tcset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tdeprec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tenum.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tfields.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tfixed.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tfloat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tinit.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tnative.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Toffset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Toh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Topaque.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Torder.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tpad.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tprecis.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tstrpad.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tvisit.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Tvlen.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5VM.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5WB.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Z.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zdeflate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zfletcher32.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Znbit.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zscaleoffset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zshuffle.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zszip.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ztrans.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5checksum.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5dbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5detect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5lib_settings.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5make_libsettings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5system.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5timer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5trace.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1536,7 +1667,10 @@ recheck: all
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1569,7 +1703,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS) \
 		H5config.h all-local
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(settingsdir)" "$(DESTDIR)$(includedir)"; do \
@@ -1616,7 +1750,251 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/H5.Plo
+	-rm -f ./$(DEPDIR)/H5A.Plo
+	-rm -f ./$(DEPDIR)/H5AC.Plo
+	-rm -f ./$(DEPDIR)/H5Abtree2.Plo
+	-rm -f ./$(DEPDIR)/H5Adense.Plo
+	-rm -f ./$(DEPDIR)/H5Adeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Aint.Plo
+	-rm -f ./$(DEPDIR)/H5Atest.Plo
+	-rm -f ./$(DEPDIR)/H5B.Plo
+	-rm -f ./$(DEPDIR)/H5B2.Plo
+	-rm -f ./$(DEPDIR)/H5B2cache.Plo
+	-rm -f ./$(DEPDIR)/H5B2dbg.Plo
+	-rm -f ./$(DEPDIR)/H5B2hdr.Plo
+	-rm -f ./$(DEPDIR)/H5B2int.Plo
+	-rm -f ./$(DEPDIR)/H5B2stat.Plo
+	-rm -f ./$(DEPDIR)/H5B2test.Plo
+	-rm -f ./$(DEPDIR)/H5Bcache.Plo
+	-rm -f ./$(DEPDIR)/H5Bdbg.Plo
+	-rm -f ./$(DEPDIR)/H5C.Plo
+	-rm -f ./$(DEPDIR)/H5CS.Plo
+	-rm -f ./$(DEPDIR)/H5D.Plo
+	-rm -f ./$(DEPDIR)/H5Dbtree.Plo
+	-rm -f ./$(DEPDIR)/H5Dchunk.Plo
+	-rm -f ./$(DEPDIR)/H5Dcompact.Plo
+	-rm -f ./$(DEPDIR)/H5Dcontig.Plo
+	-rm -f ./$(DEPDIR)/H5Ddbg.Plo
+	-rm -f ./$(DEPDIR)/H5Ddeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Defl.Plo
+	-rm -f ./$(DEPDIR)/H5Dfill.Plo
+	-rm -f ./$(DEPDIR)/H5Dint.Plo
+	-rm -f ./$(DEPDIR)/H5Dio.Plo
+	-rm -f ./$(DEPDIR)/H5Dlayout.Plo
+	-rm -f ./$(DEPDIR)/H5Dmpio.Plo
+	-rm -f ./$(DEPDIR)/H5Doh.Plo
+	-rm -f ./$(DEPDIR)/H5Dscatgath.Plo
+	-rm -f ./$(DEPDIR)/H5Dselect.Plo
+	-rm -f ./$(DEPDIR)/H5Dtest.Plo
+	-rm -f ./$(DEPDIR)/H5E.Plo
+	-rm -f ./$(DEPDIR)/H5Edeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Eint.Plo
+	-rm -f ./$(DEPDIR)/H5F.Plo
+	-rm -f ./$(DEPDIR)/H5FD.Plo
+	-rm -f ./$(DEPDIR)/H5FDcore.Plo
+	-rm -f ./$(DEPDIR)/H5FDdirect.Plo
+	-rm -f ./$(DEPDIR)/H5FDfamily.Plo
+	-rm -f ./$(DEPDIR)/H5FDhdfs.Plo
+	-rm -f ./$(DEPDIR)/H5FDint.Plo
+	-rm -f ./$(DEPDIR)/H5FDlog.Plo
+	-rm -f ./$(DEPDIR)/H5FDmpi.Plo
+	-rm -f ./$(DEPDIR)/H5FDmpio.Plo
+	-rm -f ./$(DEPDIR)/H5FDmulti.Plo
+	-rm -f ./$(DEPDIR)/H5FDros3.Plo
+	-rm -f ./$(DEPDIR)/H5FDs3comms.Plo
+	-rm -f ./$(DEPDIR)/H5FDsec2.Plo
+	-rm -f ./$(DEPDIR)/H5FDspace.Plo
+	-rm -f ./$(DEPDIR)/H5FDstdio.Plo
+	-rm -f ./$(DEPDIR)/H5FL.Plo
+	-rm -f ./$(DEPDIR)/H5FO.Plo
+	-rm -f ./$(DEPDIR)/H5FS.Plo
+	-rm -f ./$(DEPDIR)/H5FScache.Plo
+	-rm -f ./$(DEPDIR)/H5FSdbg.Plo
+	-rm -f ./$(DEPDIR)/H5FSsection.Plo
+	-rm -f ./$(DEPDIR)/H5FSstat.Plo
+	-rm -f ./$(DEPDIR)/H5FStest.Plo
+	-rm -f ./$(DEPDIR)/H5Faccum.Plo
+	-rm -f ./$(DEPDIR)/H5Fcwfs.Plo
+	-rm -f ./$(DEPDIR)/H5Fdbg.Plo
+	-rm -f ./$(DEPDIR)/H5Fefc.Plo
+	-rm -f ./$(DEPDIR)/H5Ffake.Plo
+	-rm -f ./$(DEPDIR)/H5Fint.Plo
+	-rm -f ./$(DEPDIR)/H5Fio.Plo
+	-rm -f ./$(DEPDIR)/H5Fmount.Plo
+	-rm -f ./$(DEPDIR)/H5Fmpi.Plo
+	-rm -f ./$(DEPDIR)/H5Fquery.Plo
+	-rm -f ./$(DEPDIR)/H5Fsfile.Plo
+	-rm -f ./$(DEPDIR)/H5Fsuper.Plo
+	-rm -f ./$(DEPDIR)/H5Fsuper_cache.Plo
+	-rm -f ./$(DEPDIR)/H5Ftest.Plo
+	-rm -f ./$(DEPDIR)/H5G.Plo
+	-rm -f ./$(DEPDIR)/H5Gbtree2.Plo
+	-rm -f ./$(DEPDIR)/H5Gcache.Plo
+	-rm -f ./$(DEPDIR)/H5Gcompact.Plo
+	-rm -f ./$(DEPDIR)/H5Gdense.Plo
+	-rm -f ./$(DEPDIR)/H5Gdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Gent.Plo
+	-rm -f ./$(DEPDIR)/H5Gint.Plo
+	-rm -f ./$(DEPDIR)/H5Glink.Plo
+	-rm -f ./$(DEPDIR)/H5Gloc.Plo
+	-rm -f ./$(DEPDIR)/H5Gname.Plo
+	-rm -f ./$(DEPDIR)/H5Gnode.Plo
+	-rm -f ./$(DEPDIR)/H5Gobj.Plo
+	-rm -f ./$(DEPDIR)/H5Goh.Plo
+	-rm -f ./$(DEPDIR)/H5Groot.Plo
+	-rm -f ./$(DEPDIR)/H5Gstab.Plo
+	-rm -f ./$(DEPDIR)/H5Gtest.Plo
+	-rm -f ./$(DEPDIR)/H5Gtraverse.Plo
+	-rm -f ./$(DEPDIR)/H5HF.Plo
+	-rm -f ./$(DEPDIR)/H5HFbtree2.Plo
+	-rm -f ./$(DEPDIR)/H5HFcache.Plo
+	-rm -f ./$(DEPDIR)/H5HFdbg.Plo
+	-rm -f ./$(DEPDIR)/H5HFdblock.Plo
+	-rm -f ./$(DEPDIR)/H5HFdtable.Plo
+	-rm -f ./$(DEPDIR)/H5HFhdr.Plo
+	-rm -f ./$(DEPDIR)/H5HFhuge.Plo
+	-rm -f ./$(DEPDIR)/H5HFiblock.Plo
+	-rm -f ./$(DEPDIR)/H5HFiter.Plo
+	-rm -f ./$(DEPDIR)/H5HFman.Plo
+	-rm -f ./$(DEPDIR)/H5HFsection.Plo
+	-rm -f ./$(DEPDIR)/H5HFspace.Plo
+	-rm -f ./$(DEPDIR)/H5HFstat.Plo
+	-rm -f ./$(DEPDIR)/H5HFtest.Plo
+	-rm -f ./$(DEPDIR)/H5HFtiny.Plo
+	-rm -f ./$(DEPDIR)/H5HG.Plo
+	-rm -f ./$(DEPDIR)/H5HGcache.Plo
+	-rm -f ./$(DEPDIR)/H5HGdbg.Plo
+	-rm -f ./$(DEPDIR)/H5HGquery.Plo
+	-rm -f ./$(DEPDIR)/H5HL.Plo
+	-rm -f ./$(DEPDIR)/H5HLcache.Plo
+	-rm -f ./$(DEPDIR)/H5HLdbg.Plo
+	-rm -f ./$(DEPDIR)/H5HLint.Plo
+	-rm -f ./$(DEPDIR)/H5HP.Plo
+	-rm -f ./$(DEPDIR)/H5I.Plo
+	-rm -f ./$(DEPDIR)/H5Itest.Plo
+	-rm -f ./$(DEPDIR)/H5L.Plo
+	-rm -f ./$(DEPDIR)/H5Lexternal.Plo
+	-rm -f ./$(DEPDIR)/H5MF.Plo
+	-rm -f ./$(DEPDIR)/H5MFaggr.Plo
+	-rm -f ./$(DEPDIR)/H5MFdbg.Plo
+	-rm -f ./$(DEPDIR)/H5MFsection.Plo
+	-rm -f ./$(DEPDIR)/H5MM.Plo
+	-rm -f ./$(DEPDIR)/H5MP.Plo
+	-rm -f ./$(DEPDIR)/H5MPtest.Plo
+	-rm -f ./$(DEPDIR)/H5O.Plo
+	-rm -f ./$(DEPDIR)/H5Oainfo.Plo
+	-rm -f ./$(DEPDIR)/H5Oalloc.Plo
+	-rm -f ./$(DEPDIR)/H5Oattr.Plo
+	-rm -f ./$(DEPDIR)/H5Oattribute.Plo
+	-rm -f ./$(DEPDIR)/H5Obogus.Plo
+	-rm -f ./$(DEPDIR)/H5Obtreek.Plo
+	-rm -f ./$(DEPDIR)/H5Ocache.Plo
+	-rm -f ./$(DEPDIR)/H5Ochunk.Plo
+	-rm -f ./$(DEPDIR)/H5Ocont.Plo
+	-rm -f ./$(DEPDIR)/H5Ocopy.Plo
+	-rm -f ./$(DEPDIR)/H5Odbg.Plo
+	-rm -f ./$(DEPDIR)/H5Odrvinfo.Plo
+	-rm -f ./$(DEPDIR)/H5Odtype.Plo
+	-rm -f ./$(DEPDIR)/H5Oefl.Plo
+	-rm -f ./$(DEPDIR)/H5Ofill.Plo
+	-rm -f ./$(DEPDIR)/H5Oginfo.Plo
+	-rm -f ./$(DEPDIR)/H5Olayout.Plo
+	-rm -f ./$(DEPDIR)/H5Olinfo.Plo
+	-rm -f ./$(DEPDIR)/H5Olink.Plo
+	-rm -f ./$(DEPDIR)/H5Omessage.Plo
+	-rm -f ./$(DEPDIR)/H5Omtime.Plo
+	-rm -f ./$(DEPDIR)/H5Oname.Plo
+	-rm -f ./$(DEPDIR)/H5Onull.Plo
+	-rm -f ./$(DEPDIR)/H5Opline.Plo
+	-rm -f ./$(DEPDIR)/H5Orefcount.Plo
+	-rm -f ./$(DEPDIR)/H5Osdspace.Plo
+	-rm -f ./$(DEPDIR)/H5Oshared.Plo
+	-rm -f ./$(DEPDIR)/H5Oshmesg.Plo
+	-rm -f ./$(DEPDIR)/H5Ostab.Plo
+	-rm -f ./$(DEPDIR)/H5Otest.Plo
+	-rm -f ./$(DEPDIR)/H5Ounknown.Plo
+	-rm -f ./$(DEPDIR)/H5P.Plo
+	-rm -f ./$(DEPDIR)/H5PL.Plo
+	-rm -f ./$(DEPDIR)/H5Pacpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pdapl.Plo
+	-rm -f ./$(DEPDIR)/H5Pdcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Pdxpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pfapl.Plo
+	-rm -f ./$(DEPDIR)/H5Pfcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pfmpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pgcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pint.Plo
+	-rm -f ./$(DEPDIR)/H5Plapl.Plo
+	-rm -f ./$(DEPDIR)/H5Plcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pocpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pocpypl.Plo
+	-rm -f ./$(DEPDIR)/H5Pstrcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Ptest.Plo
+	-rm -f ./$(DEPDIR)/H5R.Plo
+	-rm -f ./$(DEPDIR)/H5RC.Plo
+	-rm -f ./$(DEPDIR)/H5RS.Plo
+	-rm -f ./$(DEPDIR)/H5Rdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5S.Plo
+	-rm -f ./$(DEPDIR)/H5SL.Plo
+	-rm -f ./$(DEPDIR)/H5SM.Plo
+	-rm -f ./$(DEPDIR)/H5SMbtree2.Plo
+	-rm -f ./$(DEPDIR)/H5SMcache.Plo
+	-rm -f ./$(DEPDIR)/H5SMmessage.Plo
+	-rm -f ./$(DEPDIR)/H5SMtest.Plo
+	-rm -f ./$(DEPDIR)/H5ST.Plo
+	-rm -f ./$(DEPDIR)/H5Sall.Plo
+	-rm -f ./$(DEPDIR)/H5Sdbg.Plo
+	-rm -f ./$(DEPDIR)/H5Shyper.Plo
+	-rm -f ./$(DEPDIR)/H5Smpio.Plo
+	-rm -f ./$(DEPDIR)/H5Snone.Plo
+	-rm -f ./$(DEPDIR)/H5Spoint.Plo
+	-rm -f ./$(DEPDIR)/H5Sselect.Plo
+	-rm -f ./$(DEPDIR)/H5Stest.Plo
+	-rm -f ./$(DEPDIR)/H5T.Plo
+	-rm -f ./$(DEPDIR)/H5TS.Plo
+	-rm -f ./$(DEPDIR)/H5Tarray.Plo
+	-rm -f ./$(DEPDIR)/H5Tbit.Plo
+	-rm -f ./$(DEPDIR)/H5Tcommit.Plo
+	-rm -f ./$(DEPDIR)/H5Tcompound.Plo
+	-rm -f ./$(DEPDIR)/H5Tconv.Plo
+	-rm -f ./$(DEPDIR)/H5Tcset.Plo
+	-rm -f ./$(DEPDIR)/H5Tdbg.Plo
+	-rm -f ./$(DEPDIR)/H5Tdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Tenum.Plo
+	-rm -f ./$(DEPDIR)/H5Tfields.Plo
+	-rm -f ./$(DEPDIR)/H5Tfixed.Plo
+	-rm -f ./$(DEPDIR)/H5Tfloat.Plo
+	-rm -f ./$(DEPDIR)/H5Tinit.Plo
+	-rm -f ./$(DEPDIR)/H5Tnative.Plo
+	-rm -f ./$(DEPDIR)/H5Toffset.Plo
+	-rm -f ./$(DEPDIR)/H5Toh.Plo
+	-rm -f ./$(DEPDIR)/H5Topaque.Plo
+	-rm -f ./$(DEPDIR)/H5Torder.Plo
+	-rm -f ./$(DEPDIR)/H5Tpad.Plo
+	-rm -f ./$(DEPDIR)/H5Tprecis.Plo
+	-rm -f ./$(DEPDIR)/H5Tstrpad.Plo
+	-rm -f ./$(DEPDIR)/H5Tvisit.Plo
+	-rm -f ./$(DEPDIR)/H5Tvlen.Plo
+	-rm -f ./$(DEPDIR)/H5VM.Plo
+	-rm -f ./$(DEPDIR)/H5WB.Plo
+	-rm -f ./$(DEPDIR)/H5Z.Plo
+	-rm -f ./$(DEPDIR)/H5Zdeflate.Plo
+	-rm -f ./$(DEPDIR)/H5Zfletcher32.Plo
+	-rm -f ./$(DEPDIR)/H5Znbit.Plo
+	-rm -f ./$(DEPDIR)/H5Zscaleoffset.Plo
+	-rm -f ./$(DEPDIR)/H5Zshuffle.Plo
+	-rm -f ./$(DEPDIR)/H5Zszip.Plo
+	-rm -f ./$(DEPDIR)/H5Ztrans.Plo
+	-rm -f ./$(DEPDIR)/H5checksum.Plo
+	-rm -f ./$(DEPDIR)/H5dbg.Plo
+	-rm -f ./$(DEPDIR)/H5detect.Po
+	-rm -f ./$(DEPDIR)/H5lib_settings.Plo
+	-rm -f ./$(DEPDIR)/H5make_libsettings.Po
+	-rm -f ./$(DEPDIR)/H5system.Plo
+	-rm -f ./$(DEPDIR)/H5timer.Plo
+	-rm -f ./$(DEPDIR)/H5trace.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -1662,7 +2040,251 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/H5.Plo
+	-rm -f ./$(DEPDIR)/H5A.Plo
+	-rm -f ./$(DEPDIR)/H5AC.Plo
+	-rm -f ./$(DEPDIR)/H5Abtree2.Plo
+	-rm -f ./$(DEPDIR)/H5Adense.Plo
+	-rm -f ./$(DEPDIR)/H5Adeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Aint.Plo
+	-rm -f ./$(DEPDIR)/H5Atest.Plo
+	-rm -f ./$(DEPDIR)/H5B.Plo
+	-rm -f ./$(DEPDIR)/H5B2.Plo
+	-rm -f ./$(DEPDIR)/H5B2cache.Plo
+	-rm -f ./$(DEPDIR)/H5B2dbg.Plo
+	-rm -f ./$(DEPDIR)/H5B2hdr.Plo
+	-rm -f ./$(DEPDIR)/H5B2int.Plo
+	-rm -f ./$(DEPDIR)/H5B2stat.Plo
+	-rm -f ./$(DEPDIR)/H5B2test.Plo
+	-rm -f ./$(DEPDIR)/H5Bcache.Plo
+	-rm -f ./$(DEPDIR)/H5Bdbg.Plo
+	-rm -f ./$(DEPDIR)/H5C.Plo
+	-rm -f ./$(DEPDIR)/H5CS.Plo
+	-rm -f ./$(DEPDIR)/H5D.Plo
+	-rm -f ./$(DEPDIR)/H5Dbtree.Plo
+	-rm -f ./$(DEPDIR)/H5Dchunk.Plo
+	-rm -f ./$(DEPDIR)/H5Dcompact.Plo
+	-rm -f ./$(DEPDIR)/H5Dcontig.Plo
+	-rm -f ./$(DEPDIR)/H5Ddbg.Plo
+	-rm -f ./$(DEPDIR)/H5Ddeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Defl.Plo
+	-rm -f ./$(DEPDIR)/H5Dfill.Plo
+	-rm -f ./$(DEPDIR)/H5Dint.Plo
+	-rm -f ./$(DEPDIR)/H5Dio.Plo
+	-rm -f ./$(DEPDIR)/H5Dlayout.Plo
+	-rm -f ./$(DEPDIR)/H5Dmpio.Plo
+	-rm -f ./$(DEPDIR)/H5Doh.Plo
+	-rm -f ./$(DEPDIR)/H5Dscatgath.Plo
+	-rm -f ./$(DEPDIR)/H5Dselect.Plo
+	-rm -f ./$(DEPDIR)/H5Dtest.Plo
+	-rm -f ./$(DEPDIR)/H5E.Plo
+	-rm -f ./$(DEPDIR)/H5Edeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Eint.Plo
+	-rm -f ./$(DEPDIR)/H5F.Plo
+	-rm -f ./$(DEPDIR)/H5FD.Plo
+	-rm -f ./$(DEPDIR)/H5FDcore.Plo
+	-rm -f ./$(DEPDIR)/H5FDdirect.Plo
+	-rm -f ./$(DEPDIR)/H5FDfamily.Plo
+	-rm -f ./$(DEPDIR)/H5FDhdfs.Plo
+	-rm -f ./$(DEPDIR)/H5FDint.Plo
+	-rm -f ./$(DEPDIR)/H5FDlog.Plo
+	-rm -f ./$(DEPDIR)/H5FDmpi.Plo
+	-rm -f ./$(DEPDIR)/H5FDmpio.Plo
+	-rm -f ./$(DEPDIR)/H5FDmulti.Plo
+	-rm -f ./$(DEPDIR)/H5FDros3.Plo
+	-rm -f ./$(DEPDIR)/H5FDs3comms.Plo
+	-rm -f ./$(DEPDIR)/H5FDsec2.Plo
+	-rm -f ./$(DEPDIR)/H5FDspace.Plo
+	-rm -f ./$(DEPDIR)/H5FDstdio.Plo
+	-rm -f ./$(DEPDIR)/H5FL.Plo
+	-rm -f ./$(DEPDIR)/H5FO.Plo
+	-rm -f ./$(DEPDIR)/H5FS.Plo
+	-rm -f ./$(DEPDIR)/H5FScache.Plo
+	-rm -f ./$(DEPDIR)/H5FSdbg.Plo
+	-rm -f ./$(DEPDIR)/H5FSsection.Plo
+	-rm -f ./$(DEPDIR)/H5FSstat.Plo
+	-rm -f ./$(DEPDIR)/H5FStest.Plo
+	-rm -f ./$(DEPDIR)/H5Faccum.Plo
+	-rm -f ./$(DEPDIR)/H5Fcwfs.Plo
+	-rm -f ./$(DEPDIR)/H5Fdbg.Plo
+	-rm -f ./$(DEPDIR)/H5Fefc.Plo
+	-rm -f ./$(DEPDIR)/H5Ffake.Plo
+	-rm -f ./$(DEPDIR)/H5Fint.Plo
+	-rm -f ./$(DEPDIR)/H5Fio.Plo
+	-rm -f ./$(DEPDIR)/H5Fmount.Plo
+	-rm -f ./$(DEPDIR)/H5Fmpi.Plo
+	-rm -f ./$(DEPDIR)/H5Fquery.Plo
+	-rm -f ./$(DEPDIR)/H5Fsfile.Plo
+	-rm -f ./$(DEPDIR)/H5Fsuper.Plo
+	-rm -f ./$(DEPDIR)/H5Fsuper_cache.Plo
+	-rm -f ./$(DEPDIR)/H5Ftest.Plo
+	-rm -f ./$(DEPDIR)/H5G.Plo
+	-rm -f ./$(DEPDIR)/H5Gbtree2.Plo
+	-rm -f ./$(DEPDIR)/H5Gcache.Plo
+	-rm -f ./$(DEPDIR)/H5Gcompact.Plo
+	-rm -f ./$(DEPDIR)/H5Gdense.Plo
+	-rm -f ./$(DEPDIR)/H5Gdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Gent.Plo
+	-rm -f ./$(DEPDIR)/H5Gint.Plo
+	-rm -f ./$(DEPDIR)/H5Glink.Plo
+	-rm -f ./$(DEPDIR)/H5Gloc.Plo
+	-rm -f ./$(DEPDIR)/H5Gname.Plo
+	-rm -f ./$(DEPDIR)/H5Gnode.Plo
+	-rm -f ./$(DEPDIR)/H5Gobj.Plo
+	-rm -f ./$(DEPDIR)/H5Goh.Plo
+	-rm -f ./$(DEPDIR)/H5Groot.Plo
+	-rm -f ./$(DEPDIR)/H5Gstab.Plo
+	-rm -f ./$(DEPDIR)/H5Gtest.Plo
+	-rm -f ./$(DEPDIR)/H5Gtraverse.Plo
+	-rm -f ./$(DEPDIR)/H5HF.Plo
+	-rm -f ./$(DEPDIR)/H5HFbtree2.Plo
+	-rm -f ./$(DEPDIR)/H5HFcache.Plo
+	-rm -f ./$(DEPDIR)/H5HFdbg.Plo
+	-rm -f ./$(DEPDIR)/H5HFdblock.Plo
+	-rm -f ./$(DEPDIR)/H5HFdtable.Plo
+	-rm -f ./$(DEPDIR)/H5HFhdr.Plo
+	-rm -f ./$(DEPDIR)/H5HFhuge.Plo
+	-rm -f ./$(DEPDIR)/H5HFiblock.Plo
+	-rm -f ./$(DEPDIR)/H5HFiter.Plo
+	-rm -f ./$(DEPDIR)/H5HFman.Plo
+	-rm -f ./$(DEPDIR)/H5HFsection.Plo
+	-rm -f ./$(DEPDIR)/H5HFspace.Plo
+	-rm -f ./$(DEPDIR)/H5HFstat.Plo
+	-rm -f ./$(DEPDIR)/H5HFtest.Plo
+	-rm -f ./$(DEPDIR)/H5HFtiny.Plo
+	-rm -f ./$(DEPDIR)/H5HG.Plo
+	-rm -f ./$(DEPDIR)/H5HGcache.Plo
+	-rm -f ./$(DEPDIR)/H5HGdbg.Plo
+	-rm -f ./$(DEPDIR)/H5HGquery.Plo
+	-rm -f ./$(DEPDIR)/H5HL.Plo
+	-rm -f ./$(DEPDIR)/H5HLcache.Plo
+	-rm -f ./$(DEPDIR)/H5HLdbg.Plo
+	-rm -f ./$(DEPDIR)/H5HLint.Plo
+	-rm -f ./$(DEPDIR)/H5HP.Plo
+	-rm -f ./$(DEPDIR)/H5I.Plo
+	-rm -f ./$(DEPDIR)/H5Itest.Plo
+	-rm -f ./$(DEPDIR)/H5L.Plo
+	-rm -f ./$(DEPDIR)/H5Lexternal.Plo
+	-rm -f ./$(DEPDIR)/H5MF.Plo
+	-rm -f ./$(DEPDIR)/H5MFaggr.Plo
+	-rm -f ./$(DEPDIR)/H5MFdbg.Plo
+	-rm -f ./$(DEPDIR)/H5MFsection.Plo
+	-rm -f ./$(DEPDIR)/H5MM.Plo
+	-rm -f ./$(DEPDIR)/H5MP.Plo
+	-rm -f ./$(DEPDIR)/H5MPtest.Plo
+	-rm -f ./$(DEPDIR)/H5O.Plo
+	-rm -f ./$(DEPDIR)/H5Oainfo.Plo
+	-rm -f ./$(DEPDIR)/H5Oalloc.Plo
+	-rm -f ./$(DEPDIR)/H5Oattr.Plo
+	-rm -f ./$(DEPDIR)/H5Oattribute.Plo
+	-rm -f ./$(DEPDIR)/H5Obogus.Plo
+	-rm -f ./$(DEPDIR)/H5Obtreek.Plo
+	-rm -f ./$(DEPDIR)/H5Ocache.Plo
+	-rm -f ./$(DEPDIR)/H5Ochunk.Plo
+	-rm -f ./$(DEPDIR)/H5Ocont.Plo
+	-rm -f ./$(DEPDIR)/H5Ocopy.Plo
+	-rm -f ./$(DEPDIR)/H5Odbg.Plo
+	-rm -f ./$(DEPDIR)/H5Odrvinfo.Plo
+	-rm -f ./$(DEPDIR)/H5Odtype.Plo
+	-rm -f ./$(DEPDIR)/H5Oefl.Plo
+	-rm -f ./$(DEPDIR)/H5Ofill.Plo
+	-rm -f ./$(DEPDIR)/H5Oginfo.Plo
+	-rm -f ./$(DEPDIR)/H5Olayout.Plo
+	-rm -f ./$(DEPDIR)/H5Olinfo.Plo
+	-rm -f ./$(DEPDIR)/H5Olink.Plo
+	-rm -f ./$(DEPDIR)/H5Omessage.Plo
+	-rm -f ./$(DEPDIR)/H5Omtime.Plo
+	-rm -f ./$(DEPDIR)/H5Oname.Plo
+	-rm -f ./$(DEPDIR)/H5Onull.Plo
+	-rm -f ./$(DEPDIR)/H5Opline.Plo
+	-rm -f ./$(DEPDIR)/H5Orefcount.Plo
+	-rm -f ./$(DEPDIR)/H5Osdspace.Plo
+	-rm -f ./$(DEPDIR)/H5Oshared.Plo
+	-rm -f ./$(DEPDIR)/H5Oshmesg.Plo
+	-rm -f ./$(DEPDIR)/H5Ostab.Plo
+	-rm -f ./$(DEPDIR)/H5Otest.Plo
+	-rm -f ./$(DEPDIR)/H5Ounknown.Plo
+	-rm -f ./$(DEPDIR)/H5P.Plo
+	-rm -f ./$(DEPDIR)/H5PL.Plo
+	-rm -f ./$(DEPDIR)/H5Pacpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pdapl.Plo
+	-rm -f ./$(DEPDIR)/H5Pdcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Pdxpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pfapl.Plo
+	-rm -f ./$(DEPDIR)/H5Pfcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pfmpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pgcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pint.Plo
+	-rm -f ./$(DEPDIR)/H5Plapl.Plo
+	-rm -f ./$(DEPDIR)/H5Plcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pocpl.Plo
+	-rm -f ./$(DEPDIR)/H5Pocpypl.Plo
+	-rm -f ./$(DEPDIR)/H5Pstrcpl.Plo
+	-rm -f ./$(DEPDIR)/H5Ptest.Plo
+	-rm -f ./$(DEPDIR)/H5R.Plo
+	-rm -f ./$(DEPDIR)/H5RC.Plo
+	-rm -f ./$(DEPDIR)/H5RS.Plo
+	-rm -f ./$(DEPDIR)/H5Rdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5S.Plo
+	-rm -f ./$(DEPDIR)/H5SL.Plo
+	-rm -f ./$(DEPDIR)/H5SM.Plo
+	-rm -f ./$(DEPDIR)/H5SMbtree2.Plo
+	-rm -f ./$(DEPDIR)/H5SMcache.Plo
+	-rm -f ./$(DEPDIR)/H5SMmessage.Plo
+	-rm -f ./$(DEPDIR)/H5SMtest.Plo
+	-rm -f ./$(DEPDIR)/H5ST.Plo
+	-rm -f ./$(DEPDIR)/H5Sall.Plo
+	-rm -f ./$(DEPDIR)/H5Sdbg.Plo
+	-rm -f ./$(DEPDIR)/H5Shyper.Plo
+	-rm -f ./$(DEPDIR)/H5Smpio.Plo
+	-rm -f ./$(DEPDIR)/H5Snone.Plo
+	-rm -f ./$(DEPDIR)/H5Spoint.Plo
+	-rm -f ./$(DEPDIR)/H5Sselect.Plo
+	-rm -f ./$(DEPDIR)/H5Stest.Plo
+	-rm -f ./$(DEPDIR)/H5T.Plo
+	-rm -f ./$(DEPDIR)/H5TS.Plo
+	-rm -f ./$(DEPDIR)/H5Tarray.Plo
+	-rm -f ./$(DEPDIR)/H5Tbit.Plo
+	-rm -f ./$(DEPDIR)/H5Tcommit.Plo
+	-rm -f ./$(DEPDIR)/H5Tcompound.Plo
+	-rm -f ./$(DEPDIR)/H5Tconv.Plo
+	-rm -f ./$(DEPDIR)/H5Tcset.Plo
+	-rm -f ./$(DEPDIR)/H5Tdbg.Plo
+	-rm -f ./$(DEPDIR)/H5Tdeprec.Plo
+	-rm -f ./$(DEPDIR)/H5Tenum.Plo
+	-rm -f ./$(DEPDIR)/H5Tfields.Plo
+	-rm -f ./$(DEPDIR)/H5Tfixed.Plo
+	-rm -f ./$(DEPDIR)/H5Tfloat.Plo
+	-rm -f ./$(DEPDIR)/H5Tinit.Plo
+	-rm -f ./$(DEPDIR)/H5Tnative.Plo
+	-rm -f ./$(DEPDIR)/H5Toffset.Plo
+	-rm -f ./$(DEPDIR)/H5Toh.Plo
+	-rm -f ./$(DEPDIR)/H5Topaque.Plo
+	-rm -f ./$(DEPDIR)/H5Torder.Plo
+	-rm -f ./$(DEPDIR)/H5Tpad.Plo
+	-rm -f ./$(DEPDIR)/H5Tprecis.Plo
+	-rm -f ./$(DEPDIR)/H5Tstrpad.Plo
+	-rm -f ./$(DEPDIR)/H5Tvisit.Plo
+	-rm -f ./$(DEPDIR)/H5Tvlen.Plo
+	-rm -f ./$(DEPDIR)/H5VM.Plo
+	-rm -f ./$(DEPDIR)/H5WB.Plo
+	-rm -f ./$(DEPDIR)/H5Z.Plo
+	-rm -f ./$(DEPDIR)/H5Zdeflate.Plo
+	-rm -f ./$(DEPDIR)/H5Zfletcher32.Plo
+	-rm -f ./$(DEPDIR)/H5Znbit.Plo
+	-rm -f ./$(DEPDIR)/H5Zscaleoffset.Plo
+	-rm -f ./$(DEPDIR)/H5Zshuffle.Plo
+	-rm -f ./$(DEPDIR)/H5Zszip.Plo
+	-rm -f ./$(DEPDIR)/H5Ztrans.Plo
+	-rm -f ./$(DEPDIR)/H5checksum.Plo
+	-rm -f ./$(DEPDIR)/H5dbg.Plo
+	-rm -f ./$(DEPDIR)/H5detect.Po
+	-rm -f ./$(DEPDIR)/H5lib_settings.Plo
+	-rm -f ./$(DEPDIR)/H5make_libsettings.Po
+	-rm -f ./$(DEPDIR)/H5system.Plo
+	-rm -f ./$(DEPDIR)/H5timer.Plo
+	-rm -f ./$(DEPDIR)/H5trace.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1684,8 +2306,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
 
 .MAKE: all check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
-	check-am clean clean-generic clean-libLTLIBRARIES \
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+	check-TESTS check-am clean clean-generic clean-libLTLIBRARIES \
 	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
 	ctags-am distclean distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags distdir dvi \
diff --git a/src/hdf5.h b/src/hdf5.h
index 067f4b4..92bcdc0 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -39,16 +39,16 @@
 #include "H5Zpublic.h"  /* Data filters                             */
 
 /* Predefined file drivers */
-#include "H5FDcore.h"     /* Files stored entirely in memory          */
-#include "H5FDdirect.h"   /* Linux direct I/O                         */
-#include "H5FDfamily.h"   /* File families                            */
-#include "H5FDhdfs.h"     /* Hadoop HDFS                              */
-#include "H5FDlog.h"      /* sec2 driver with I/O logging (for debugging) */
-#include "H5FDmpi.h"      /* MPI-based file drivers                   */
-#include "H5FDmulti.h"    /* Usage-partitioned file family            */
-#include "H5FDros3.h"     /* R/O S3 "file" I/O                        */
-#include "H5FDsec2.h"     /* POSIX unbuffered file I/O                */
-#include "H5FDstdio.h"    /* Standard C buffered I/O                  */
+#include "H5FDcore.h"   /* Files stored entirely in memory          */
+#include "H5FDdirect.h" /* Linux direct I/O                         */
+#include "H5FDfamily.h" /* File families                            */
+#include "H5FDhdfs.h"   /* Hadoop HDFS                              */
+#include "H5FDlog.h"    /* sec2 driver with I/O logging (for debugging) */
+#include "H5FDmpi.h"    /* MPI-based file drivers                   */
+#include "H5FDmulti.h"  /* Usage-partitioned file family            */
+#include "H5FDros3.h"   /* R/O S3 "file" I/O                        */
+#include "H5FDsec2.h"   /* POSIX unbuffered file I/O                */
+#include "H5FDstdio.h"  /* Standard C buffered I/O                  */
 #ifdef H5_HAVE_WINDOWS
 #include "H5FDwindows.h" /* Win32 I/O                                */
 #endif
author	Allen Byrne <byrn@hdfgroup.org>	2020-10-14 12:45:01 (GMT)
committer	Allen Byrne <byrn@hdfgroup.org>	2020-10-15 13:09:49 (GMT)
commit	ce13b5f0472500e54afca638d6c6ef8e7090466e (patch)
tree	c5f66cb63f808f8ed6da3feb7c5b24d29ce0de85 /src
parent	48d171b04730aff7beade684e9afd164f0204b0c (diff)
download	hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.zip hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.tar.gz hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.tar.bz2