[svn-r1078] Changes since 19990215

---------------------- ./src/H5.c Fixed more dependency problems in H5_term_library(). There was a bug in the previous version that could cause the wrong EOF marker to be written to the boot block under certain circumstances. Hopefully this fixes it although I don't ready access to a test case (Mark Miller will test it). ./src/H5F.c ./src/H5Fprivate.h Added an H5F_close_all() that is similar to H5F_term_interface() but which doesn't close the interface. Files that don't have open object headers are closed, others are delayed until all object headers close. All files are flushed. ./src/H5ACprivate.h ./src/H5Bprivate.h ./src/H5Dprivate.h ./src/H5Eprivate.h ./src/H5Fprivate.h ./src/H5Gpkg.h ./src/H5Gprivate.h ./src/H5Gpublic.h ./src/H5HGprivate.h ./src/H5HLprivate.h ./src/H5Iprivate.h ./src/H5MFprivate.h ./src/H5MMprivate.h ./src/H5Oprivate.h ./src/H5Pprivate.h ./src/H5Ppublic.h ./src/H5RAprivate.h ./src/H5Sprivate.h ./src/H5Spublic.h ./src/H5Tpkg.h ./src/H5Tprivate.h ./src/H5Tpublic.h ./src/H5Vprivate.h ./src/H5Zprivate.h ./src/H5private.h ./src/H5public.h Reindented after __DLL__ was added.
author: Robb Matzke <matzke@llnl.gov> 1999-02-18 16:21:34 (GMT)
committer: Robb Matzke <matzke@llnl.gov> 1999-02-18 16:21:34 (GMT)
commit: 37cfaf1665f1a036c4a907367c7e25b7ac849013 (patch)
tree: cbdea15114da44de5f1d74057fdb8de449d18f41 /src
parent: 901051cecb91bffb1920c0b31bec2f0661363a1a (diff)
download: hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.zip
hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.tar.gz
hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.tar.bz2
29 files changed, 961 insertions, 778 deletions
diff --git a/src/.distdep b/src/.distdep
index dcad55c..ba25bdb 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -1,35 +1,3 @@
-H5.o: \
-   H5.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Ipublic.h \
-   H5Dpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Pprivate.h \
-   H5Ppublic.h \
-   H5Zpublic.h \
-   H5Rpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h
 H5A.o: \
    H5A.c \
    H5private.h \
@@ -135,38 +103,6 @@ H5E.o: \
    H5config.h \
    H5api_adpt.h \
    H5Iprivate.h
-H5F.o: \
-   H5F.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Aprivate.h \
-   H5Apublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Dprivate.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Iprivate.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h
 H5Farray.o: \
    H5Farray.c \
    H5private.h \
@@ -1146,38 +1082,6 @@ H5Sselect.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h
-H5T.o: \
-   H5T.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Iprivate.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Tpkg.h \
-   H5Rprivate.h
 H5Tbit.o: \
    H5Tbit.c \
    H5private.h \
@@ -1200,30 +1104,6 @@ H5Tbit.o: \
    H5Tpublic.h \
    H5Gprivate.h \
    H5Gpublic.h
-H5Tconv.o: \
-   H5Tconv.c \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5private.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Tpkg.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Rprivate.h \
-   H5Rpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h
 H5Tinit.o: \
    H5Tinit.c \
    H5private.h \
@@ -1307,3 +1187,123 @@ H5Z.o: \
    H5Sprivate.h \
    H5Spublic.h \
    H5Zprivate.h
+H5Tconv.o: \
+   H5Tconv.c \
+   H5Iprivate.h \
+   H5Ipublic.h \
+   H5public.h \
+   H5config.h \
+   H5api_adpt.h \
+   H5private.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Tpkg.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Rprivate.h \
+   H5Rpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h
+H5T.o: \
+   H5T.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5api_adpt.h \
+   H5Dprivate.h \
+   H5Dpublic.h \
+   H5Ipublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Iprivate.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Tpkg.h \
+   H5Rprivate.h
+H5.o: \
+   H5.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5api_adpt.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Iprivate.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Pprivate.h \
+   H5Ppublic.h \
+   H5Zpublic.h \
+   H5Rpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h
+H5F.o: \
+   H5F.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5api_adpt.h \
+   H5Aprivate.h \
+   H5Apublic.h \
+   H5Ipublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Dprivate.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Iprivate.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h
diff --git a/src/H5.c b/src/H5.c
index b9bda39..822804b 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -148,11 +148,13 @@ H5_term_library(void)
      *	       because it's cache depends on almost all other meta object
      *	       packages and those packages depend on H5O which depends on H5F
      *	       (because H5F_close() can delay until all object headers are
-     *	       closed). We handle this cycle by closing the H5F interface,
-     *	       which flushes the cache of all files, breaking any cycles.
+     *	       closed). We handle this cycle by calling H5F_close() for all
+     *	       files, which flushes the meta data caches and updates the file
+     *	       boot block but doesn't actually finalize the close until all
+     *	       open objects are closed by the H5*_term_interface() functions
+     *	       below. Once that happens we can close the H5F interface.
      */
-    H5F_term_interface(-1);
-    H5F_term_interface(0);
+    H5F_close_all();
 
     /* Function			   What depends on it?			*/
     /*-------------------------   -------------------------------	*/
@@ -166,8 +168,8 @@ H5_term_library(void)
     H5S_term_interface(-1);	/*					*/
     H5T_native_close(-1);	/* D RA					*/
     H5T_term_interface(-1);	/* D RA					*/
-    H5F_term_interface(-1); 	/* G T					*/
     H5P_term_interface(-1);	/* D					*/
+    H5F_term_interface(-1); 	/* A D G S T				*/
     H5I_term_interface(-1);	/* A D F G P RA S T TB Z		*/
     /*------------------------- ---------------------------------	*/
 
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index be2b4b8..96fc6f9 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -107,19 +107,21 @@ typedef struct H5AC_t {
  * Library prototypes.
  */
 __DLL__ herr_t H5AC_dest (H5F_t *f);
-__DLL__ void *H5AC_find_f (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
-		   const void *udata1, void *udata2);
-__DLL__ void *H5AC_protect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
-		    const void *udata1, void *udata2);
+__DLL__ void *H5AC_find_f (H5F_t *f, const H5AC_class_t *type,
+			   const haddr_t *addr, const void *udata1,
+			   void *udata2);
+__DLL__ void *H5AC_protect (H5F_t *f, const H5AC_class_t *type,
+			    const haddr_t *addr, const void *udata1,
+			    void *udata2);
 __DLL__ herr_t H5AC_unprotect (H5F_t *f, const H5AC_class_t *type,
-		       const haddr_t *addr, void *thing);
+			       const haddr_t *addr, void *thing);
 __DLL__ herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type,
 			   const haddr_t *addr, hbool_t destroy);
 __DLL__ herr_t H5AC_create (H5F_t *f, intn size_hint);
 __DLL__ herr_t H5AC_rename (H5F_t *f, const H5AC_class_t *type,
-		    const haddr_t *old_addr, const haddr_t *new_addr);
-__DLL__ herr_t H5AC_set (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
-		 void *thing);
+			    const haddr_t *old_addr, const haddr_t *new_addr);
+__DLL__ herr_t H5AC_set (H5F_t *f, const H5AC_class_t *type,
+			 const haddr_t *addr, void *thing);
 __DLL__ herr_t H5AC_debug (H5F_t *f);
 
 #define H5AC_find(F,TYPE,ADDR_P,UDATA1,UDATA2)				      \
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 91eb201..4cdfd9e 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -121,15 +121,18 @@ typedef struct H5B_t {
 /*
  * Library prototypes.
  */
-__DLL__ herr_t H5B_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent,
-		  intn fwidth, const H5B_class_t *type, void *udata);
-__DLL__ herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata, haddr_t *);
-__DLL__ herr_t H5B_find (H5F_t *f, const H5B_class_t *type, const haddr_t *addr,
-		 void *udata);
-__DLL__ herr_t H5B_insert (H5F_t *f, const H5B_class_t *type, const haddr_t *addr,
-		   const double split_ratios[], void *udata);
-__DLL__ herr_t H5B_remove(H5F_t *f, const H5B_class_t *type, const haddr_t *addr,
-		  void *udata);
-__DLL__ herr_t H5B_iterate (H5F_t *f, const H5B_class_t *type, const haddr_t *addr,
-		    void *udata);
+__DLL__ herr_t H5B_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
+			  intn indent, intn fwidth, const H5B_class_t *type,
+			  void *udata);
+__DLL__ herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata,
+			   haddr_t *);
+__DLL__ herr_t H5B_find (H5F_t *f, const H5B_class_t *type,
+			 const haddr_t *addr, void *udata);
+__DLL__ herr_t H5B_insert (H5F_t *f, const H5B_class_t *type,
+			   const haddr_t *addr, const double split_ratios[],
+			   void *udata);
+__DLL__ herr_t H5B_remove(H5F_t *f, const H5B_class_t *type,
+			  const haddr_t *addr, void *udata);
+__DLL__ herr_t H5B_iterate (H5F_t *f, const H5B_class_t *type,
+			    const haddr_t *addr, void *udata);
 #endif
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 1cd4432..89cfba5 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -67,17 +67,18 @@ __DLLVAR__ const H5D_create_t H5D_create_dflt;
 __DLLVAR__ const H5D_xfer_t H5D_xfer_dflt;
 
 /* Functions defined in H5D.c */
-__DLL__ H5D_t *H5D_create (H5G_entry_t *loc, const char *name, const H5T_t *type,
-		   const H5S_t *space, const H5D_create_t *create_parms);
+__DLL__ H5D_t *H5D_create (H5G_entry_t *loc, const char *name,
+			   const H5T_t *type, const H5S_t *space,
+			   const H5D_create_t *create_parms);
 __DLL__ H5D_t *H5D_open (H5G_entry_t *loc, const char *name);
 __DLL__ herr_t H5D_close (H5D_t *dataset);
 __DLL__ htri_t H5D_isa(H5G_entry_t *ent);
 __DLL__ herr_t H5D_read (H5D_t *dataset, const H5T_t *mem_type,
-		 const H5S_t *mem_space, const H5S_t *file_space,
-		 const H5D_xfer_t *xfer_parms, void *buf/*out*/);
+			 const H5S_t *mem_space, const H5S_t *file_space,
+			 const H5D_xfer_t *xfer_parms, void *buf/*out*/);
 __DLL__ herr_t H5D_write (H5D_t *dataset, const H5T_t *mem_type,
-		  const H5S_t *mem_space, const H5S_t *file_space,
-		  const H5D_xfer_t *xfer_parms, const void *buf);
+			  const H5S_t *mem_space, const H5S_t *file_space,
+			  const H5D_xfer_t *xfer_parms, const void *buf);
 __DLL__ herr_t H5D_extend (H5D_t *dataset, const hsize_t *size);
 __DLL__ H5G_entry_t *H5D_entof (H5D_t *dataset);
 __DLL__ H5T_t *H5D_typeof (H5D_t *dset);
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index fcce520..89f9c5c 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -103,15 +103,14 @@ typedef struct H5E_t {
     H5E_error_t slot[H5E_NSLOTS];	/*array of error records	     */
 } H5E_t;
 
-__DLLVAR__ const hbool_t H5E_clearable_g;	/*safe to call H5E_clear() on enter? */
+__DLLVAR__ const hbool_t H5E_clearable_g;/*safe to call H5E_clear() on enter?*/
 __DLLVAR__ herr_t (*H5E_auto_g)(void *client_data);
 __DLLVAR__ void *H5E_auto_data_g;
 
 __DLL__ herr_t H5E_push (H5E_major_t maj_num, H5E_minor_t min_num,
-		 const char *func_name, const char *file_name, unsigned line,
-		 const char *desc);
+			 const char *func_name, const char *file_name,
+			 unsigned line, const char *desc);
 __DLL__ herr_t H5E_clear (void);
-__DLL__ herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func, void *client_data);
-
-
+__DLL__ herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func,
+			 void *client_data);
 #endif
diff --git a/src/H5F.c b/src/H5F.c
index 4798141..bfe4068 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -244,6 +244,46 @@ H5F_term_interface(intn status)
 }
 
 
+/*-------------------------------------------------------------------------
+ * Function:	H5F_close_all
+ *
+ * Purpose:	Closes all open files. If a file has open object headers then
+ *		the underlying file is held open until all object headers are
+ *		closed for the file (see H5O_close()).
+ *
+ * Return:	Success:	Non-negative
+ *
+ *		Failure:	Negative
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, February 18, 1999
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5F_close_all(void)
+{
+    FUNC_ENTER(H5F_close_all, FAIL);
+
+    /*
+     * There is no way to call H5F_close() on all items in the group and
+     * remove the items from the group without destroying the group, so we do
+     * it in two steps: first destroy the group, then create a new empty
+     * group.
+     */
+    H5I_destroy_group(H5I_FILE);
+    if (H5I_init_group(H5I_FILE, H5I_FILEID_HASHSIZE, 0,
+		       (herr_t (*)(void*))H5F_close)<0) {
+	HRETURN_ERROR (H5E_FILE, H5E_CANTINIT, FAIL,
+		       "unable to initialize file group");
+    }
+
+    FUNC_LEAVE(SUCCEED);
+}
+
+
 /*--------------------------------------------------------------------------
  NAME
        H5F_encode_length_unusual -- encode an unusual length size
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 994f515..4150ce8 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -404,13 +404,13 @@ typedef struct H5F_low_t {
 #ifndef H5F_LOW_DFLT
 #  define H5F_LOW_DFLT	H5F_LOW_SEC2	/* The default type	  */
 #endif
-__DLLVAR__ const H5F_low_class_t H5F_LOW_SEC2_g[];	/* Posix section 2	*/
-__DLLVAR__ const H5F_low_class_t H5F_LOW_STDIO_g[];	/* Posix stdio		*/
-__DLLVAR__ const H5F_low_class_t H5F_LOW_CORE_g[];	/* In-core temp file	*/
-__DLLVAR__ const H5F_low_class_t H5F_LOW_FAMILY_g[];/* File family		*/
-__DLLVAR__ const H5F_low_class_t H5F_LOW_SPLIT_g[];	/* Split meta/raw data	*/
+__DLLVAR__ const H5F_low_class_t H5F_LOW_SEC2_g[];  /*Posix section 2	 */
+__DLLVAR__ const H5F_low_class_t H5F_LOW_STDIO_g[]; /*Posix stdio	 */
+__DLLVAR__ const H5F_low_class_t H5F_LOW_CORE_g[];  /*In-core temp file	 */
+__DLLVAR__ const H5F_low_class_t H5F_LOW_FAMILY_g[];/*File family	 */
+__DLLVAR__ const H5F_low_class_t H5F_LOW_SPLIT_g[]; /*Split meta/raw data*/
 #ifdef HAVE_PARALLEL
-__DLLVAR__ const H5F_low_class_t H5F_LOW_MPIO_g[];	/* MPI-IO		*/
+__DLLVAR__ const H5F_low_class_t H5F_LOW_MPIO_g[];  /*MPI-IO		 */
 #endif
 
 /* The raw data chunk cache */
@@ -545,10 +545,12 @@ __DLLVAR__  hbool_t H5_mpi_1_metawrite_g;
 
 /* Private functions, not part of the publicly documented API */
 __DLL__ herr_t H5F_init(void);
-__DLL__ void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l);
+__DLL__ herr_t H5F_close_all(void);
+__DLL__ void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p,
+				       uint8_t *l);
 __DLL__ H5F_t *H5F_open(const char *name, uintn flags,
-		const H5F_create_t *create_parms,
-		const H5F_access_t *access_parms);
+			const H5F_create_t *create_parms,
+			const H5F_access_t *access_parms);
 __DLL__ herr_t H5F_close(H5F_t *f);
 __DLL__ herr_t H5F_debug(H5F_t *f, const haddr_t *addr, FILE * stream,
 			 intn indent, intn fwidth);
@@ -583,54 +585,58 @@ __DLL__ herr_t H5F_istore_init (H5F_t *f);
 __DLL__ herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt);
 __DLL__ herr_t H5F_istore_dest (H5F_t *f);
 __DLL__ herr_t H5F_istore_stats (H5F_t *f, hbool_t headers);
-__DLL__ herr_t H5F_istore_create(H5F_t *f, struct H5O_layout_t *layout /*in,out*/);
+__DLL__ herr_t H5F_istore_create(H5F_t *f,
+				 struct H5O_layout_t *layout/*in,out*/);
 __DLL__ herr_t H5F_istore_read(H5F_t *f, const struct H5D_xfer_t *xfer,
-		       const struct H5O_layout_t *layout,
-		       const struct H5O_pline_t *pline,
-		       const struct H5O_fill_t *fill,
-		       const hssize_t offset[], const hsize_t size[],
-		       void *buf /*out */ );
+			       const struct H5O_layout_t *layout,
+			       const struct H5O_pline_t *pline,
+			       const struct H5O_fill_t *fill,
+			       const hssize_t offset[], const hsize_t size[],
+			       void *buf/*out*/);
 __DLL__ herr_t H5F_istore_write(H5F_t *f, const struct H5D_xfer_t *xfer,
-			const struct H5O_layout_t *layout,
-			const struct H5O_pline_t *pline,
-			const struct H5O_fill_t *fill,
-			const hssize_t offset[], const hsize_t size[],
-			const void *buf);
+				const struct H5O_layout_t *layout,
+				const struct H5O_pline_t *pline,
+				const struct H5O_fill_t *fill,
+				const hssize_t offset[], const hsize_t size[],
+				const void *buf);
 __DLL__ herr_t H5F_istore_allocate (H5F_t *f,
-			    const struct H5O_layout_t *layout,
-			    const hsize_t *space_dim,
-			    const double split_ratios[], 
-			    const struct H5O_pline_t *pline,
-			    const struct H5O_fill_t *fill);
+				    const struct H5O_layout_t *layout,
+				    const hsize_t *space_dim,
+				    const double split_ratios[], 
+				    const struct H5O_pline_t *pline,
+				    const struct H5O_fill_t *fill);
 
 /* Functions that operate on contiguous storage wrt boot block */
 __DLL__ herr_t H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size,
 			      const H5D_transfer_t xfer_mode, void *buf);
 __DLL__ herr_t H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size,
-		       const H5D_transfer_t xfer_mode, const void *buf);
+			       const H5D_transfer_t xfer_mode,
+			       const void *buf);
 
 /* Functions that operate directly on low-level files */
 __DLL__ const H5F_low_class_t *H5F_low_class (H5F_driver_t driver);
 __DLL__ herr_t H5F_low_extend(H5F_low_t *lf, const H5F_access_t *access_parms,
-		      intn op, hsize_t size, haddr_t *addr/*out*/);
+			      intn op, hsize_t size, haddr_t *addr/*out*/);
 __DLL__ herr_t H5F_low_seteof(H5F_low_t *lf, const haddr_t *addr);
 __DLL__ intn H5F_low_alloc (H5F_low_t *lf, intn op, hsize_t alignment,
-		    hsize_t threshold, hsize_t size, H5MF_free_t *blk,
-		    haddr_t *addr/*out*/);
+			    hsize_t threshold, hsize_t size, H5MF_free_t *blk,
+			    haddr_t *addr/*out*/);
 __DLL__ htri_t H5F_low_access(const H5F_low_class_t *type, const char *name,
-		      const H5F_access_t *access_parms, int mode,
-		      H5F_search_t *key);
+			      const H5F_access_t *access_parms, int mode,
+			      H5F_search_t *key);
 __DLL__ H5F_low_t *H5F_low_open(const H5F_low_class_t *type, const char *name,
-			const H5F_access_t *access_parms, uintn flags,
-			H5F_search_t *key);
-__DLL__ H5F_low_t *H5F_low_close(H5F_low_t *lf, const H5F_access_t *access_parms);
+				const H5F_access_t *access_parms, uintn flags,
+				H5F_search_t *key);
+__DLL__ H5F_low_t *H5F_low_close(H5F_low_t *lf,
+				 const H5F_access_t *access_parms);
 __DLL__ hsize_t H5F_low_size(H5F_low_t *lf, haddr_t *addr);
 __DLL__ herr_t H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms,
-		    const H5D_transfer_t xfer_mode,
-		    const haddr_t *addr, size_t size, uint8_t *buf);
+			    const H5D_transfer_t xfer_mode,
+			    const haddr_t *addr, size_t size, uint8_t *buf);
 __DLL__ herr_t H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms,
-		     const H5D_transfer_t xfer_mode,
-		     const haddr_t *addr, size_t size, const uint8_t *buf);
+			     const H5D_transfer_t xfer_mode,
+			     const haddr_t *addr, size_t size,
+			     const uint8_t *buf);
 __DLL__ herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms);
 
 /* Functions that operate on addresses */
@@ -658,9 +664,9 @@ __DLL__ herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr, const long objno[2]);
 
 /* Functions for MPI-IO */
 #ifdef HAVE_PARALLEL
-__DLL__ htri_t H5F_mpio_tas_allsame(H5F_low_t *lf, hbool_t newval );
-__DLL__ herr_t H5PC_Wait_for_left_neighbor( MPI_Comm comm );
-__DLL__ herr_t H5PC_Signal_right_neighbor( MPI_Comm comm );
+__DLL__ htri_t H5F_mpio_tas_allsame(H5F_low_t *lf, hbool_t newval);
+__DLL__ herr_t H5PC_Wait_for_left_neighbor(MPI_Comm comm);
+__DLL__ herr_t H5PC_Signal_right_neighbor(MPI_Comm comm);
 #endif /* HAVE_PARALLEL */
 
 #endif
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index dadf8c4..4071227 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -120,18 +120,19 @@ __DLLVAR__ const H5AC_class_t H5AC_SNODE[1];
  * functions that understand names are exported to the rest of
  * the library and appear in H5Gprivate.h.
  */
-__DLL__ herr_t H5G_stab_create (H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/);
-__DLL__ herr_t H5G_stab_find (H5G_entry_t *grp_ent, const char *name,
-                      H5G_entry_t *obj_ent/*out*/);
-__DLL__ herr_t H5G_stab_insert (H5G_entry_t *grp_ent, const char *name,
-                        H5G_entry_t *obj_ent);
+__DLL__ herr_t H5G_stab_create(H5F_t *f, size_t size_hint,
+			       H5G_entry_t *ent/*out*/);
+__DLL__ herr_t H5G_stab_find(H5G_entry_t *grp_ent, const char *name,
+			     H5G_entry_t *obj_ent/*out*/);
+__DLL__ herr_t H5G_stab_insert(H5G_entry_t *grp_ent, const char *name,
+			       H5G_entry_t *obj_ent);
 __DLL__ herr_t H5G_stab_remove(H5G_entry_t *grp_ent, const char *name);
 
 /*
  * Functions that understand symbol table entries.
  */
-__DLL__ herr_t H5G_ent_decode_vec (H5F_t *f, const uint8_t **pp, H5G_entry_t *ent,
-                           intn n);
-__DLL__ herr_t H5G_ent_encode_vec (H5F_t *f, uint8_t **pp, const H5G_entry_t *ent,
-			   intn n);
+__DLL__ herr_t H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp,
+				  H5G_entry_t *ent, intn n);
+__DLL__ herr_t H5G_ent_encode_vec(H5F_t *f, uint8_t **pp,
+				  const H5G_entry_t *ent, intn n);
 #endif
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 82d4124..c805f7a 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -111,52 +111,59 @@ typedef struct H5G_typeinfo_t {
  * call.
  */
 __DLL__ herr_t H5G_register_type(intn type, htri_t(*isa)(H5G_entry_t*),
-			 const char *desc);
-__DLL__ H5G_entry_t *H5G_loc (hid_t loc_id);
-__DLL__ herr_t H5G_mkroot (H5F_t *f, H5G_entry_t *root_entry);
-__DLL__ H5G_entry_t *H5G_entof (H5G_t *grp);
-__DLL__ H5F_t *H5G_fileof (H5G_t *grp);
-__DLL__ H5G_t *H5G_create (H5G_entry_t *loc, const char *name, size_t size_hint);
-__DLL__ H5G_t *H5G_open (H5G_entry_t *loc, const char *name);
-__DLL__ H5G_t *H5G_reopen (H5G_t *grp);
-__DLL__ herr_t H5G_close (H5G_t *grp);
+				 const char *desc);
+__DLL__ H5G_entry_t *H5G_loc(hid_t loc_id);
+__DLL__ herr_t H5G_mkroot(H5F_t *f, H5G_entry_t *root_entry);
+__DLL__ H5G_entry_t *H5G_entof(H5G_t *grp);
+__DLL__ H5F_t *H5G_fileof(H5G_t *grp);
+__DLL__ H5G_t *H5G_create(H5G_entry_t *loc, const char *name,
+			  size_t size_hint);
+__DLL__ H5G_t *H5G_open(H5G_entry_t *loc, const char *name);
+__DLL__ H5G_t *H5G_reopen(H5G_t *grp);
+__DLL__ herr_t H5G_close(H5G_t *grp);
 __DLL__ H5G_t *H5G_rootof(H5F_t *f);
 __DLL__ htri_t H5G_isa(H5G_entry_t *ent);
-__DLL__ herr_t H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name,
-		 const char *new_name, uintn namei_flags);
+__DLL__ herr_t H5G_link(H5G_entry_t *loc, H5G_link_t type,
+			const char *cur_name, const char *new_name,
+			uintn namei_flags);
 __DLL__ intn H5G_get_type(H5G_entry_t *ent);
-__DLL__ herr_t H5G_get_objinfo (H5G_entry_t *loc, const char *name,
-			hbool_t follow_link, H5G_stat_t *statbuf/*out*/);
-__DLL__ herr_t H5G_linkval (H5G_entry_t *loc, const char *name, size_t size,
-		    char *buf/*out*/);
-__DLL__ herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf);
-__DLL__ intn H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize,
-		     char *buf);
-__DLL__ herr_t H5G_insert (H5G_entry_t *loc, const char *name, H5G_entry_t *ent);
-__DLL__ herr_t H5G_move(H5G_entry_t *loc, const char *src_name, const char *dst_name);
+__DLL__ herr_t H5G_get_objinfo(H5G_entry_t *loc, const char *name,
+			       hbool_t follow_link,
+			       H5G_stat_t *statbuf/*out*/);
+__DLL__ herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size,
+			   char *buf/*out*/);
+__DLL__ herr_t H5G_set_comment(H5G_entry_t *loc, const char *name,
+			       const char *buf);
+__DLL__ intn H5G_get_comment(H5G_entry_t *loc, const char *name,
+			     size_t bufsize, char *buf);
+__DLL__ herr_t H5G_insert(H5G_entry_t *loc, const char *name,
+			  H5G_entry_t *ent);
+__DLL__ herr_t H5G_move(H5G_entry_t *loc, const char *src_name,
+			const char *dst_name);
 __DLL__ herr_t H5G_unlink(H5G_entry_t *loc, const char *name);
-__DLL__ herr_t H5G_find (H5G_entry_t *loc, const char *name,
-		 H5G_entry_t *grp_ent/*out*/, H5G_entry_t *ent/*out*/);
+__DLL__ herr_t H5G_find(H5G_entry_t *loc, const char *name,
+			H5G_entry_t *grp_ent/*out*/, H5G_entry_t *ent/*out*/);
 __DLL__ H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name);
-__DLL__ herr_t H5G_traverse_slink (H5G_entry_t *grp_ent/*in,out*/,
-			   H5G_entry_t *obj_ent/*in,out*/,
-			   intn *nlinks/*in,out*/);
-__DLL__ herr_t H5G_ent_encode (H5F_t *f, uint8_t **pp, const H5G_entry_t *ent);
-__DLL__ herr_t H5G_ent_decode (H5F_t *f, const uint8_t **pp, H5G_entry_t *ent/*out*/);
+__DLL__ herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/,
+				  H5G_entry_t *obj_ent/*in,out*/,
+				  intn *nlinks/*in,out*/);
+__DLL__ herr_t H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent);
+__DLL__ herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp,
+			      H5G_entry_t *ent/*out*/);
 
 /*
  * These functions operate on symbol table nodes.
  */
-__DLL__ herr_t H5G_node_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
-                       intn indent, intn fwidth, const haddr_t *heap);
+__DLL__ herr_t H5G_node_debug(H5F_t *f, const haddr_t *addr, FILE * stream,
+			      intn indent, intn fwidth, const haddr_t *heap);
 
 /*
  * These functions operate on symbol table entries.  They're used primarily
  * in the H5O package where header messages are cached in symbol table
  * entries.  The subclasses of H5O probably don't need them though.
  */
-__DLL__ H5G_cache_t *H5G_ent_cache (H5G_entry_t *ent, H5G_type_t *cache_type);
-__DLL__ herr_t H5G_ent_modified (H5G_entry_t *ent, H5G_type_t cache_type);
-__DLL__ herr_t H5G_ent_debug (H5F_t *f, const H5G_entry_t *ent, FILE * stream,
-		      intn indent, intn fwidth, const haddr_t *heap);
+__DLL__ H5G_cache_t *H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type);
+__DLL__ herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type);
+__DLL__ herr_t H5G_ent_debug(H5F_t *f, const H5G_entry_t *ent, FILE * stream,
+			     intn indent, intn fwidth, const haddr_t *heap);
 #endif
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index f2b9fbf..29272e5 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -70,21 +70,23 @@ typedef struct H5G_stat_t {
 typedef herr_t (*H5G_iterate_t)(hid_t group, const char *name,
 				void *op_data);
 
-__DLL__ hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint);
-__DLL__ hid_t H5Gopen (hid_t loc_id, const char *name);
-__DLL__ herr_t H5Gclose (hid_t group_id);
-__DLL__ herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op,
-		   void *op_data);
-__DLL__ herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
-__DLL__ herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,
-		const char *new_name);
-__DLL__ herr_t H5Gunlink (hid_t loc_id, const char *name);
-__DLL__ herr_t H5Gget_objinfo (hid_t loc_id, const char *name, hbool_t follow_link,
-		H5G_stat_t *statbuf/*out*/);
-__DLL__ herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size,
-		       char *buf/*out*/);
-__DLL__ herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
-__DLL__ int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf);
+__DLL__ hid_t H5Gcreate(hid_t loc_id, const char *name, size_t size_hint);
+__DLL__ hid_t H5Gopen(hid_t loc_id, const char *name);
+__DLL__ herr_t H5Gclose(hid_t group_id);
+__DLL__ herr_t H5Giterate(hid_t loc_id, const char *name, int *idx,
+			  H5G_iterate_t op, void *op_data);
+__DLL__ herr_t H5Gmove(hid_t loc_id, const char *src, const char *dst);
+__DLL__ herr_t H5Glink(hid_t loc_id, H5G_link_t type, const char *cur_name,
+		       const char *new_name);
+__DLL__ herr_t H5Gunlink(hid_t loc_id, const char *name);
+__DLL__ herr_t H5Gget_objinfo(hid_t loc_id, const char *name,
+			      hbool_t follow_link, H5G_stat_t *statbuf/*out*/);
+__DLL__ herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size,
+			      char *buf/*out*/);
+__DLL__ herr_t H5Gset_comment(hid_t loc_id, const char *name,
+			      const char *comment);
+__DLL__ int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize,
+			   char *buf);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h
index c4e0f1f..feeedd2 100644
--- a/src/H5HGprivate.h
+++ b/src/H5HGprivate.h
@@ -97,13 +97,13 @@ typedef struct H5HG_t {
 
 typedef struct H5HG_heap_t H5HG_heap_t;
 
-__DLL__ H5HG_heap_t *H5HG_create (H5F_t *f, size_t size);
-__DLL__ herr_t H5HG_insert (H5F_t *f, size_t size, void *obj,
-			    H5HG_t *hobj/*out*/);
-__DLL__ void *H5HG_peek (H5F_t *f, H5HG_t *hobj);
-__DLL__ void *H5HG_read (H5F_t *f, H5HG_t *hobj, void *object);
-__DLL__ intn H5HG_link (H5F_t *f, H5HG_t *hobj, intn adjust);
-__DLL__ herr_t H5HG_remove (H5F_t *f, H5HG_t *hobj);
+__DLL__ H5HG_heap_t *H5HG_create(H5F_t *f, size_t size);
+__DLL__ herr_t H5HG_insert(H5F_t *f, size_t size, void *obj,
+			   H5HG_t *hobj/*out*/);
+__DLL__ void *H5HG_peek(H5F_t *f, H5HG_t *hobj);
+__DLL__ void *H5HG_read(H5F_t *f, H5HG_t *hobj, void *object);
+__DLL__ intn H5HG_link(H5F_t *f, H5HG_t *hobj, intn adjust);
+__DLL__ herr_t H5HG_remove(H5F_t *f, H5HG_t *hobj);
 __DLL__ herr_t H5HG_debug(H5F_t *f, const haddr_t *addr, FILE *stream,
 			  intn indent, intn fwidth);
 
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 8f7aa59..afb3523 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -50,15 +50,16 @@
 /*
  * Library prototypes...
  */
-__DLL__ herr_t H5HL_create (H5F_t *f, size_t size_hint, haddr_t *addr/*out*/);
-void *H5HL_read (H5F_t *f, const haddr_t *addr, size_t offset, size_t size,
-		 void *buf);
-__DLL__ const void *H5HL_peek (H5F_t *f, const haddr_t *addr, size_t offset);
-__DLL__ size_t H5HL_insert (H5F_t *f, const haddr_t *addr, size_t size,
-			    const void *buf);
-__DLL__ herr_t H5HL_write (H5F_t *f, const haddr_t *addr, size_t offset, size_t size,
-		   const void *buf);
-__DLL__ herr_t H5HL_remove (H5F_t *f, const haddr_t *addr, size_t offset, size_t size);
-__DLL__ herr_t H5HL_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
-			   intn indent, intn fwidth);
+__DLL__ herr_t H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/);
+__DLL__ void *H5HL_read(H5F_t *f, const haddr_t *addr, size_t offset,
+			size_t size, void *buf);
+__DLL__ const void *H5HL_peek(H5F_t *f, const haddr_t *addr, size_t offset);
+__DLL__ size_t H5HL_insert(H5F_t *f, const haddr_t *addr, size_t size,
+			   const void *buf);
+__DLL__ herr_t H5HL_write(H5F_t *f, const haddr_t *addr, size_t offset,
+			  size_t size, const void *buf);
+__DLL__ herr_t H5HL_remove(H5F_t *f, const haddr_t *addr, size_t offset,
+			   size_t size);
+__DLL__ herr_t H5HL_debug(H5F_t *f, const haddr_t *addr, FILE * stream,
+			  intn indent, intn fwidth);
 #endif
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index 8b47dd5..4d3e4ef 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -62,15 +62,16 @@ typedef struct {
 typedef intn (*H5I_search_func_t) (void * obj, const void * key);
 
 /* Private Functions in H5I.c */
-__DLL__ intn H5I_init_group (H5I_type_t grp, size_t hash_size, uintn reserved,
-		     herr_t (*free_func)(void *));
-__DLL__ herr_t H5I_destroy_group (H5I_type_t grp);
-__DLL__ hid_t H5I_register (H5I_type_t grp, void *object);
-__DLL__ void *H5I_object (hid_t id);
-__DLL__ H5I_type_t H5I_get_type (hid_t id);
-__DLL__ void *H5I_remove (hid_t id);
-__DLL__ void *H5I_search (H5I_type_t grp, H5I_search_func_t func, const void *key);
-__DLL__ intn H5I_dec_ref (hid_t id);
-__DLL__ hid_t H5I_inc_ref (hid_t id);
+__DLL__ intn H5I_init_group(H5I_type_t grp, size_t hash_size, uintn reserved,
+			    herr_t (*free_func)(void *));
+__DLL__ herr_t H5I_destroy_group(H5I_type_t grp);
+__DLL__ hid_t H5I_register(H5I_type_t grp, void *object);
+__DLL__ void *H5I_object(hid_t id);
+__DLL__ H5I_type_t H5I_get_type(hid_t id);
+__DLL__ void *H5I_remove(hid_t id);
+__DLL__ void *H5I_search(H5I_type_t grp, H5I_search_func_t func,
+			 const void *key);
+__DLL__ intn H5I_dec_ref(hid_t id);
+__DLL__ hid_t H5I_inc_ref(hid_t id);
 
 #endif
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index 38f8fb7..e264121 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -37,10 +37,10 @@
 /*
  * Library prototypes...
  */
-__DLL__ herr_t H5MF_alloc (H5F_t *f, intn, hsize_t size, haddr_t *addr/*out*/);
-__DLL__ herr_t H5MF_xfree (H5F_t *f, const haddr_t *addr, hsize_t size);
-__DLL__ herr_t H5MF_realloc (H5F_t *f, intn op, hsize_t orig_size,
-		     const haddr_t *orig_addr, hsize_t new_size,
-		     haddr_t *new_addr/*out*/);
+__DLL__ herr_t H5MF_alloc(H5F_t *f, intn, hsize_t size, haddr_t *addr/*out*/);
+__DLL__ herr_t H5MF_xfree(H5F_t *f, const haddr_t *addr, hsize_t size);
+__DLL__ herr_t H5MF_realloc(H5F_t *f, intn op, hsize_t orig_size,
+			    const haddr_t *orig_addr, hsize_t new_size,
+			    haddr_t *new_addr/*out*/);
 
 #endif
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index 13a4951..be5187c 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -28,9 +28,9 @@
 /*
  * Library prototypes...
  */
-__DLL__ void *H5MM_realloc (void *mem, size_t size);
-__DLL__ char *H5MM_xstrdup (const char *s);
-__DLL__ char *H5MM_strdup (const char *s);
-__DLL__ void *H5MM_xfree (void *mem);
+__DLL__ void *H5MM_realloc(void *mem, size_t size);
+__DLL__ char *H5MM_xstrdup(const char *s);
+__DLL__ char *H5MM_strdup(const char *s);
+__DLL__ void *H5MM_xfree(void *mem);
 
 #endif
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index a6778cb..07181e0 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -151,7 +151,7 @@ typedef struct H5O_fill_t {
 #define H5O_EFL_ID		0x0007	/*external file list id		     */
 #define H5O_EFL_ALLOC		16	/*number of slots to alloc at once   */
 #define H5O_EFL_UNLIMITED	H5F_UNLIMITED /*max possible file size	     */
-__DLLVAR__ const H5O_class_t H5O_EFL[1];	/*external file list class	     */
+__DLLVAR__ const H5O_class_t H5O_EFL[1];/*external file list class	     */
 
 typedef struct H5O_efl_entry_t {
     size_t	name_offset;		/*offset of name within heap	     */
@@ -259,8 +259,8 @@ typedef struct H5O_cont_t {
 #define H5O_STAB_ID	0x0011
 __DLLVAR__ const H5O_class_t H5O_STAB[1];
 
-void *H5O_stab_fast (const H5G_cache_t *cache, const H5O_class_t *type,
-		     void *_mesg);
+__DLL__ void *H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type,
+			    void *_mesg);
 
 typedef struct H5O_stab_t {
     haddr_t	btree_addr;		/*address of B-tree		     */
@@ -268,34 +268,35 @@ typedef struct H5O_stab_t {
 } H5O_stab_t;
 
 /* General message operators */
-__DLL__ herr_t H5O_create (H5F_t *f, size_t size_hint,
-			   H5G_entry_t *ent/*out*/);
-__DLL__ herr_t H5O_open (H5G_entry_t *ent);
-__DLL__ herr_t H5O_close (H5G_entry_t *ent);
-__DLL__ intn H5O_link (H5G_entry_t *ent, intn adjust);
-__DLL__ intn H5O_count (H5G_entry_t *ent, const H5O_class_t *type);
-__DLL__ htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence);
-__DLL__ void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type,
-			intn sequence, void *mesg);
-__DLL__ intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type,
-			 intn overwrite, uintn flags, const void *mesg);
+__DLL__ herr_t H5O_create(H5F_t *f, size_t size_hint,
+			  H5G_entry_t *ent/*out*/);
+__DLL__ herr_t H5O_open(H5G_entry_t *ent);
+__DLL__ herr_t H5O_close(H5G_entry_t *ent);
+__DLL__ intn H5O_link(H5G_entry_t *ent, intn adjust);
+__DLL__ intn H5O_count(H5G_entry_t *ent, const H5O_class_t *type);
+__DLL__ htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type,
+			  intn sequence);
+__DLL__ void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type,
+		       intn sequence, void *mesg);
+__DLL__ intn H5O_modify(H5G_entry_t *ent, const H5O_class_t *type,
+			intn overwrite, uintn flags, const void *mesg);
 __DLL__ herr_t H5O_touch(H5G_entry_t *ent, hbool_t force);
-__DLL__ herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type,
-			   intn sequence);
-__DLL__ herr_t H5O_reset (const H5O_class_t *type, void *native);
-__DLL__ void *H5O_free (const H5O_class_t *type, void *mesg);
-__DLL__ void *H5O_copy (const H5O_class_t *type, const void *mesg, void *dst);
-__DLL__ herr_t H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg,
-		  H5HG_t *hobj/*out*/);
-__DLL__ herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
-			  intn indent, intn fwidth);
+__DLL__ herr_t H5O_remove(H5G_entry_t *ent, const H5O_class_t *type,
+			  intn sequence);
+__DLL__ herr_t H5O_reset(const H5O_class_t *type, void *native);
+__DLL__ void *H5O_free(const H5O_class_t *type, void *mesg);
+__DLL__ void *H5O_copy(const H5O_class_t *type, const void *mesg, void *dst);
+__DLL__ herr_t H5O_share(H5F_t *f, const H5O_class_t *type, const void *mesg,
+			 H5HG_t *hobj/*out*/);
+__DLL__ herr_t H5O_debug(H5F_t *f, const haddr_t *addr, FILE * stream,
+			 intn indent, intn fwidth);
 
 /* EFL operators */
-__DLL__ hsize_t H5O_efl_total_size (H5O_efl_t *efl);
-__DLL__ herr_t H5O_efl_read (H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
-		     hsize_t size, uint8_t *buf);
-__DLL__ herr_t H5O_efl_write (H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
-		      hsize_t size, const uint8_t *buf);
+__DLL__ hsize_t H5O_efl_total_size(H5O_efl_t *efl);
+__DLL__ herr_t H5O_efl_read(H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
+			    hsize_t size, uint8_t *buf);
+__DLL__ herr_t H5O_efl_write(H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
+			     hsize_t size, const uint8_t *buf);
 
 /* Fill value operators */
 __DLL__ herr_t H5O_fill_convert(H5O_fill_t *fill, H5T_t *type);
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 283f00a..8a8bd93 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -22,9 +22,9 @@
 #include <H5private.h>
 #include <H5Fprivate.h>
 
-__DLL__ hid_t H5P_create (H5P_class_t type, void *tmpl);
-__DLL__ void *H5P_copy (H5P_class_t type, const void *src);
-__DLL__ herr_t H5P_close (H5P_class_t type, void *tmpl);
+__DLL__ hid_t H5P_create(H5P_class_t type, void *tmpl);
+__DLL__ void *H5P_copy(H5P_class_t type, const void *src);
+__DLL__ herr_t H5P_close(H5P_class_t type, void *tmpl);
 __DLL__ H5P_class_t H5P_get_class(hid_t tid);
 
 #endif
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 4dfe932..f16fa68 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -44,78 +44,78 @@ extern "C" {
 #endif
 
 /* Public functions */
-__DLL__ hid_t H5Pcreate (H5P_class_t type);
-__DLL__ herr_t H5Pclose (hid_t plist_id);
-__DLL__ hid_t H5Pcopy (hid_t plist_id);
-__DLL__ H5P_class_t H5Pget_class (hid_t plist_id);
-__DLL__ herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/,
-			       int *freelist/*out*/, int *stab/*out*/,
-			       int *shhdr/*out*/);
-__DLL__ herr_t H5Pset_userblock (hid_t plist_id, hsize_t size);
-__DLL__ herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size);
-__DLL__ herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold,
-				 hsize_t alignment);
-__DLL__ herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/,
-				 hsize_t *alignment/*out*/);
-__DLL__ herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr,
-			     size_t sizeof_size);
-__DLL__ herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/,
-			     size_t *sizeof_size/*out*/);
-__DLL__ herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk);
-__DLL__ herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/);
-__DLL__ herr_t H5Pset_istore_k (hid_t plist_id, int ik);
-__DLL__ herr_t H5Pget_istore_k (hid_t plist_id, int *ik/*out*/);
-__DLL__ herr_t H5Pset_layout (hid_t plist_id, H5D_layout_t layout);
-__DLL__ H5D_layout_t H5Pget_layout (hid_t plist_id);
-__DLL__ herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]);
-__DLL__ int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
-__DLL__ herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset,
-				hsize_t size);
-__DLL__ int H5Pget_external_count (hid_t plist_id);
-__DLL__ herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size,
-				char *name/*out*/, off_t *offset/*out*/,
-				hsize_t *size/*out*/);
-__DLL__ H5F_driver_t H5Pget_driver (hid_t plist_id);
-__DLL__ herr_t H5Pset_stdio (hid_t plist_id);
-__DLL__ herr_t H5Pget_stdio (hid_t plist_id);
-__DLL__ herr_t H5Pset_sec2 (hid_t plist_id);
-__DLL__ herr_t H5Pget_sec2 (hid_t plist_id);
-__DLL__ herr_t H5Pset_core (hid_t plist_id, size_t increment);
-__DLL__ herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/);
-__DLL__ herr_t H5Pset_split (hid_t plist_id, const char *meta_ext,
-			     hid_t meta_plist_id, const char *raw_ext,
-			     hid_t raw_plist_id);
-__DLL__ herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size,
-			     char *meta_ext/*out*/,
-			     hid_t *meta_properties/*out*/,
-			     size_t raw_ext_size, char *raw_ext/*out*/,
-			     hid_t *raw_properties/*out*/);
+__DLL__ hid_t H5Pcreate(H5P_class_t type);
+__DLL__ herr_t H5Pclose(hid_t plist_id);
+__DLL__ hid_t H5Pcopy(hid_t plist_id);
+__DLL__ H5P_class_t H5Pget_class(hid_t plist_id);
+__DLL__ herr_t H5Pget_version(hid_t plist_id, int *boot/*out*/,
+			      int *freelist/*out*/, int *stab/*out*/,
+			      int *shhdr/*out*/);
+__DLL__ herr_t H5Pset_userblock(hid_t plist_id, hsize_t size);
+__DLL__ herr_t H5Pget_userblock(hid_t plist_id, hsize_t *size);
+__DLL__ herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold,
+				hsize_t alignment);
+__DLL__ herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
+				hsize_t *alignment/*out*/);
+__DLL__ herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr,
+			    size_t sizeof_size);
+__DLL__ herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/,
+			    size_t *sizeof_size/*out*/);
+__DLL__ herr_t H5Pset_sym_k(hid_t plist_id, int ik, int lk);
+__DLL__ herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, int *lk/*out*/);
+__DLL__ herr_t H5Pset_istore_k(hid_t plist_id, int ik);
+__DLL__ herr_t H5Pget_istore_k(hid_t plist_id, int *ik/*out*/);
+__DLL__ herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
+__DLL__ H5D_layout_t H5Pget_layout(hid_t plist_id);
+__DLL__ herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[]);
+__DLL__ int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
+__DLL__ herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset,
+			       hsize_t size);
+__DLL__ int H5Pget_external_count(hid_t plist_id);
+__DLL__ herr_t H5Pget_external(hid_t plist_id, int idx, size_t name_size,
+			       char *name/*out*/, off_t *offset/*out*/,
+			       hsize_t *size/*out*/);
+__DLL__ H5F_driver_t H5Pget_driver(hid_t plist_id);
+__DLL__ herr_t H5Pset_stdio(hid_t plist_id);
+__DLL__ herr_t H5Pget_stdio(hid_t plist_id);
+__DLL__ herr_t H5Pset_sec2(hid_t plist_id);
+__DLL__ herr_t H5Pget_sec2(hid_t plist_id);
+__DLL__ herr_t H5Pset_core(hid_t plist_id, size_t increment);
+__DLL__ herr_t H5Pget_core(hid_t plist_id, size_t *increment/*out*/);
+__DLL__ herr_t H5Pset_split(hid_t plist_id, const char *meta_ext,
+			    hid_t meta_plist_id, const char *raw_ext,
+			    hid_t raw_plist_id);
+__DLL__ herr_t H5Pget_split(hid_t plist_id, size_t meta_ext_size,
+			    char *meta_ext/*out*/,
+			    hid_t *meta_properties/*out*/,
+			    size_t raw_ext_size, char *raw_ext/*out*/,
+			    hid_t *raw_properties/*out*/);
 
-__DLL__ herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size,
-			      hid_t memb_plist_id);
-__DLL__ herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/,
-			      hid_t *memb_plist_id/*out*/);
-__DLL__ herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv,
-			      void *bkg);
-__DLL__ size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/,
-			      void **bkg/*out*/);
-__DLL__ herr_t H5Pset_preserve (hid_t plist_id, hbool_t status);
-__DLL__ int H5Pget_preserve (hid_t plist_id);
-__DLL__ herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter,
-			      unsigned int flags, size_t cd_nelmts,
-			      const unsigned int c_values[]);
+__DLL__ herr_t H5Pset_family(hid_t plist_id, hsize_t memb_size,
+			     hid_t memb_plist_id);
+__DLL__ herr_t H5Pget_family(hid_t plist_id, hsize_t *memb_size/*out*/,
+			     hid_t *memb_plist_id/*out*/);
+__DLL__ herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv,
+			     void *bkg);
+__DLL__ size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/,
+			     void **bkg/*out*/);
+__DLL__ herr_t H5Pset_preserve(hid_t plist_id, hbool_t status);
+__DLL__ int H5Pget_preserve(hid_t plist_id);
+__DLL__ herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter,
+			     unsigned int flags, size_t cd_nelmts,
+			     const unsigned int c_values[]);
 __DLL__ int H5Pget_nfilters(hid_t plist_id);
 __DLL__ H5Z_filter_t H5Pget_filter(hid_t plist_id, int filter,
 				   unsigned int *flags/*out*/,
 				   size_t *cd_nelmts/*out*/,
 				   unsigned cd_values[]/*out*/,
 				   size_t namelen, char name[]);
-__DLL__ herr_t H5Pset_deflate (hid_t plist_id, unsigned aggression);
-__DLL__ herr_t H5Pset_cache (hid_t plist_id, int mdc_nelmts, int rdcc_nelmts,
-			     size_t rdcc_nbytes, double rdcc_w0);
-__DLL__ herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts/*out*/,
-			     int *rdcc_nelmts/*out*/,
-			     size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
+__DLL__ herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression);
+__DLL__ herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, int rdcc_nelmts,
+			    size_t rdcc_nbytes, double rdcc_w0);
+__DLL__ herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/,
+			    int *rdcc_nelmts/*out*/,
+			    size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
 __DLL__ herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache,
 				  unsigned limit);
 __DLL__ herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache,
@@ -131,12 +131,12 @@ __DLL__ herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id,
 				 void *value/*out*/);
 
 #ifdef HAVE_PARALLEL
-__DLL__ herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info);
-__DLL__ herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/,
-			   MPI_Info *info/*out*/);
-__DLL__ herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode);
-__DLL__ herr_t H5Pget_xfer (hid_t plist_id,
-			    H5D_transfer_t *data_xfer_mode/*out*/);
+__DLL__ herr_t H5Pset_mpi(hid_t plist_id, MPI_Comm comm, MPI_Info info);
+__DLL__ herr_t H5Pget_mpi(hid_t plist_id, MPI_Comm *comm/*out*/,
+			  MPI_Info *info/*out*/);
+__DLL__ herr_t H5Pset_xfer(hid_t plist_id, H5D_transfer_t data_xfer_mode);
+__DLL__ herr_t H5Pget_xfer(hid_t plist_id,
+			   H5D_transfer_t *data_xfer_mode/*out*/);
 #endif
 
 __DLL__ herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
diff --git a/src/H5RAprivate.h b/src/H5RAprivate.h
index 9b7cfb0..f8dcdf7 100644
--- a/src/H5RAprivate.h
+++ b/src/H5RAprivate.h
@@ -17,13 +17,13 @@ typedef struct H5RA_t H5RA_t;
 
 __DLL__ herr_t H5RA_close(H5RA_t *ra);
 __DLL__ H5RA_t *H5RA_create(H5G_entry_t *loc, const char *name, H5T_t *type,
-		  const H5D_create_t *dcpl);
+			    const H5D_create_t *dcpl);
 __DLL__ H5RA_t *H5RA_open(H5G_entry_t *loc, const char *name);
 __DLL__ htri_t H5RA_isa(H5G_entry_t *ent);
-__DLL__ herr_t H5RA_write(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
-		 hsize_t size[], void *buf[]);
-__DLL__ herr_t H5RA_read(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
-		hsize_t size[], void *buf[]);
+__DLL__ herr_t H5RA_write(H5RA_t *ra, hssize_t start_row, hsize_t nrows,
+			  H5T_t *type, hsize_t size[], void *buf[]);
+__DLL__ herr_t H5RA_read(H5RA_t *ra, hssize_t start_row, hsize_t nrows,
+			 H5T_t *type, hsize_t size[], void *buf[]);
 __DLL__ H5G_entry_t *H5RA_entof(H5RA_t *ra);
 
 #endif
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 9032b7c..f4d4959 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -288,77 +288,85 @@ __DLLVAR__ const H5S_mconv_t	H5S_ALL_MCONV[];
 __DLLVAR__ const H5S_fconv_t	H5S_HYPER_FCONV[];
 __DLLVAR__ const H5S_mconv_t	H5S_HYPER_MCONV[];
 
-__DLL__ H5S_t *H5S_create (H5S_class_t type);
-__DLL__ H5S_t *H5S_copy (const H5S_t *src);
-__DLL__ herr_t H5S_close_simple (H5S_simple_t *simple);
-__DLL__ herr_t H5S_close (H5S_t *ds);
-__DLL__ hsize_t H5S_get_simple_extent_npoints (const H5S_t *ds);
+__DLL__ H5S_t *H5S_create(H5S_class_t type);
+__DLL__ H5S_t *H5S_copy(const H5S_t *src);
+__DLL__ herr_t H5S_close_simple(H5S_simple_t *simple);
+__DLL__ herr_t H5S_close(H5S_t *ds);
+__DLL__ hsize_t H5S_get_simple_extent_npoints(const H5S_t *ds);
 __DLL__ hsize_t H5S_get_npoints_max(const H5S_t *ds);
-__DLL__ intn H5S_get_simple_extent_ndims (const H5S_t *ds);
-__DLL__ intn H5S_get_simple_extent_dims (const H5S_t *ds, hsize_t dims[]/*out*/,
-		   hsize_t max_dims[]/*out*/);
-__DLL__ herr_t H5S_modify (H5G_entry_t *ent, const H5S_t *space);
-__DLL__ H5S_t *H5S_read (H5G_entry_t *ent);
-__DLL__ intn H5S_cmp (const H5S_t *ds1, const H5S_t *ds2);
-__DLL__ htri_t H5S_is_simple (const H5S_t *sdim);
-__DLL__ uintn H5S_nelem (const H5S_t *space);
-__DLL__ H5S_conv_t *H5S_find (const H5S_t *mem_space, const H5S_t *file_space);
-__DLL__ herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
-			     const hssize_t start[],
-			     const hsize_t _stride[],
-			     const hsize_t count[],
-			     const hsize_t _block[]);
-__DLL__ intn H5S_get_hyperslab (const H5S_t *ds, hssize_t offset[]/*out*/,
-			hsize_t size[]/*out*/, hsize_t stride[]/*out*/);
+__DLL__ intn H5S_get_simple_extent_ndims(const H5S_t *ds);
+__DLL__ intn H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
+					hsize_t max_dims[]/*out*/);
+__DLL__ herr_t H5S_modify(H5G_entry_t *ent, const H5S_t *space);
+__DLL__ H5S_t *H5S_read(H5G_entry_t *ent);
+__DLL__ intn H5S_cmp(const H5S_t *ds1, const H5S_t *ds2);
+__DLL__ htri_t H5S_is_simple(const H5S_t *sdim);
+__DLL__ uintn H5S_nelem(const H5S_t *space);
+__DLL__ H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space);
+__DLL__ herr_t H5S_select_hyperslab(H5S_t *space, H5S_seloper_t op,
+				    const hssize_t start[],
+				    const hsize_t _stride[],
+				    const hsize_t count[],
+				    const hsize_t _block[]);
+__DLL__ intn H5S_get_hyperslab(const H5S_t *ds, hssize_t offset[]/*out*/,
+			       hsize_t size[]/*out*/, hsize_t stride[]/*out*/);
 __DLL__ herr_t H5S_release_simple(H5S_simple_t *simple);
 __DLL__ herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src);
-__DLL__ herr_t H5S_select_copy (H5S_t *dst, const H5S_t *src);
-__DLL__ herr_t H5S_extent_release (H5S_t *space);
-__DLL__ herr_t H5S_select_release (H5S_t *space);
-__DLL__ herr_t H5S_sel_iter_release (const H5S_t *space,H5S_sel_iter_t *sel_iter);
-__DLL__ herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hssize_t **coord);
-__DLL__ herr_t H5S_select_all (H5S_t *space);
-__DLL__ herr_t H5S_select_none (H5S_t *space);
-__DLL__ hssize_t H5S_get_select_npoints (const H5S_t *space);
-__DLL__ intn H5S_extend (H5S_t *space, const hsize_t *size);
-__DLL__ herr_t H5S_set_extent_simple (H5S_t *space, int rank, const hsize_t *dims,
-			      const hsize_t *max);
-__DLL__ htri_t H5S_select_valid (const H5S_t *space);
-__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent,
-		 intn fwidth);
+__DLL__ herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src);
+__DLL__ herr_t H5S_extent_release(H5S_t *space);
+__DLL__ herr_t H5S_select_release(H5S_t *space);
+__DLL__ herr_t H5S_sel_iter_release(const H5S_t *space,
+				    H5S_sel_iter_t *sel_iter);
+__DLL__ herr_t H5S_select_elements(H5S_t *space, H5S_seloper_t op,
+				   size_t num_elem, const hssize_t **coord);
+__DLL__ herr_t H5S_select_all(H5S_t *space);
+__DLL__ herr_t H5S_select_none(H5S_t *space);
+__DLL__ hssize_t H5S_get_select_npoints(const H5S_t *space);
+__DLL__ intn H5S_extend(H5S_t *space, const hsize_t *size);
+__DLL__ herr_t H5S_set_extent_simple(H5S_t *space, int rank,
+				     const hsize_t *dims, const hsize_t *max);
+__DLL__ htri_t H5S_select_valid(const H5S_t *space);
+__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream,
+			 intn indent, intn fwidth);
 __DLL__ herr_t H5S_register(H5S_sel_type cls, const H5S_fconv_t *fconv,
-		    const H5S_mconv_t *mconv);
+			    const H5S_mconv_t *mconv);
 __DLL__ hssize_t H5S_select_serial_size(const H5S_t *space);
 __DLL__ herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf);
 __DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf);
 
 /* Point select functions */
-__DLL__ herr_t H5S_point_add (H5S_t *space, size_t num_elemn, const hssize_t **coord);
-__DLL__ herr_t H5S_point_release (H5S_t *space);
-__DLL__ hsize_t H5S_point_npoints (const H5S_t *space);
-__DLL__ herr_t H5S_point_copy (H5S_t *dst, const H5S_t *src);
-__DLL__ htri_t H5S_point_select_valid (const H5S_t *space);
+__DLL__ herr_t H5S_point_add(H5S_t *space, size_t num_elemn,
+			     const hssize_t **coord);
+__DLL__ herr_t H5S_point_release(H5S_t *space);
+__DLL__ hsize_t H5S_point_npoints(const H5S_t *space);
+__DLL__ herr_t H5S_point_copy(H5S_t *dst, const H5S_t *src);
+__DLL__ htri_t H5S_point_select_valid(const H5S_t *space);
 __DLL__ hssize_t H5S_point_select_serial_size(const H5S_t *space);
 __DLL__ herr_t H5S_point_select_serialize(const H5S_t *space, uint8_t *buf);
 __DLL__ herr_t H5S_point_select_deserialize(H5S_t *space, const uint8_t *buf);
 
 /* "All" select functions */
-__DLL__ herr_t H5S_all_release (H5S_t *space);
-__DLL__ hsize_t H5S_all_npoints (const H5S_t *space);
+__DLL__ herr_t H5S_all_release(H5S_t *space);
+__DLL__ hsize_t H5S_all_npoints(const H5S_t *space);
 __DLL__ herr_t H5S_all_select_serialize(const H5S_t *space, uint8_t *buf);
 __DLL__ herr_t H5S_all_select_deserialize(H5S_t *space, const uint8_t *buf);
 
 /* Hyperslab selection functions */
-__DLL__ herr_t H5S_hyper_add (H5S_t *space, const hssize_t *start, const hsize_t *end);
-__DLL__ herr_t H5S_hyper_release (H5S_t *space);
-__DLL__ herr_t H5S_hyper_sel_iter_release (H5S_sel_iter_t *sel_iter);
-__DLL__ hsize_t H5S_hyper_npoints (const H5S_t *space);
-__DLL__ int H5S_hyper_compare_regions (const void *r1, const void *r2);
-__DLL__ int H5S_hyper_compare_bounds (const void *r1, const void *r2);
-__DLL__ herr_t H5S_hyper_copy (H5S_t *dst, const H5S_t *src);
-__DLL__ htri_t H5S_hyper_select_valid (const H5S_t *space);
-__DLL__ herr_t H5S_hyper_node_add (H5S_hyper_node_t **head, intn endflag, intn rank, const hssize_t *start, const hsize_t *size);
-__DLL__ herr_t H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, H5S_hyper_node_t **overlap);
+__DLL__ herr_t H5S_hyper_add(H5S_t *space, const hssize_t *start,
+			     const hsize_t *end);
+__DLL__ herr_t H5S_hyper_release(H5S_t *space);
+__DLL__ herr_t H5S_hyper_sel_iter_release(H5S_sel_iter_t *sel_iter);
+__DLL__ hsize_t H5S_hyper_npoints(const H5S_t *space);
+__DLL__ int H5S_hyper_compare_regions(const void *r1, const void *r2);
+__DLL__ int H5S_hyper_compare_bounds(const void *r1, const void *r2);
+__DLL__ herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src);
+__DLL__ htri_t H5S_hyper_select_valid(const H5S_t *space);
+__DLL__ herr_t H5S_hyper_node_add(H5S_hyper_node_t **head, intn endflag,
+				  intn rank, const hssize_t *start,
+				  const hsize_t *size);
+__DLL__ herr_t H5S_hyper_clip(H5S_t *space, H5S_hyper_node_t *nodes,
+			      H5S_hyper_node_t **uniq,
+			      H5S_hyper_node_t **overlap);
 __DLL__ hssize_t H5S_hyper_select_serial_size(const H5S_t *space);
 __DLL__ herr_t H5S_hyper_select_serialize(const H5S_t *space, uint8_t *buf);
 __DLL__ herr_t H5S_hyper_select_deserialize(H5S_t *space, const uint8_t *buf);
@@ -368,27 +376,30 @@ __DLL__ herr_t H5S_none_select_serialize(const H5S_t *space, uint8_t *buf);
 __DLL__ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf);
 
 #ifdef HAVE_PARALLEL
-    /* MPI-IO function to read directly from app buffer to file rky980813 */
-    __DLL__ herr_t H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout,
-		   const struct H5O_pline_t *pline,
-		   const struct H5O_efl_t *efl, size_t elmt_size,
-		   const H5S_t *file_space, const H5S_t *mem_space,
-		   const H5D_transfer_t xfer_mode, void *buf/*out*/,
-                   hbool_t *must_convert /*out*/ );
-
-    /* MPI-IO function to write directly from app buffer to file rky980813 */
-    __DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f, const struct H5O_layout_t *layout,
-		    const struct H5O_pline_t *pline,
-		    const struct H5O_efl_t *efl, size_t elmt_size,
-		    const H5S_t *file_space, const H5S_t *mem_space,
-		    const H5D_transfer_t xfer_mode, const void *buf,
-                    hbool_t *must_convert /*out*/ );
-
+/* MPI-IO function to read directly from app buffer to file rky980813 */
+__DLL__ herr_t H5S_mpio_spaces_read(H5F_t *f,
+				    const struct H5O_layout_t *layout,
+				    const struct H5O_pline_t *pline,
+				    const struct H5O_efl_t *efl,
+				    size_t elmt_size, const H5S_t *file_space,
+				    const H5S_t *mem_space,
+				    const H5D_transfer_t xfer_mode,
+				    void *buf/*out*/,
+				    hbool_t *must_convert /*out*/ );
+
+/* MPI-IO function to write directly from app buffer to file rky980813 */
+__DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f,
+				     const struct H5O_layout_t *layout,
+				     const struct H5O_pline_t *pline,
+				     const struct H5O_efl_t *efl,
+				     size_t elmt_size, const H5S_t *file_space,
+				     const H5S_t *mem_space,
+				     const H5D_transfer_t xfer_mode,
+				     const void *buf,
+				     hbool_t *must_convert /*out*/ );
 #ifndef _H5S_IN_H5S_C
-    /* Global var whose value comes from environment variable */
-    __DLLVAR__ hbool_t		H5_mpi_opt_types_g;
+/* Global var whose value comes from environment variable */
+__DLLVAR__ hbool_t		H5_mpi_opt_types_g;
 #endif /* _H5S_IN_H5S_C */
-
-#endif
-
-#endif
+#endif /* HAVE_PARALLEL */
+#endif /* _H5Sprivate_H */
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index 6465476..14ab189 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -53,35 +53,35 @@ extern "C" {
 
 /* Functions in H5S.c */
 __DLL__ hid_t H5Screate(H5S_class_t type);
-__DLL__ hid_t H5Screate_simple (int rank, const hsize_t dims[],
-				const hsize_t maxdims[]);
-__DLL__ herr_t H5Sset_extent_simple (hid_t space_id, int rank,
-				     const hsize_t dims[],
-				     const hsize_t max[]);
-__DLL__ hid_t H5Scopy (hid_t space_id);
-__DLL__ herr_t H5Sclose (hid_t space_id);
-__DLL__ hsize_t H5Sget_simple_extent_npoints (hid_t space_id);
-__DLL__ int H5Sget_simple_extent_ndims (hid_t space_id);
-__DLL__ int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[],
-				       hsize_t maxdims[]);
-__DLL__ htri_t H5Sis_simple (hid_t space_id);
-__DLL__ herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims);
-__DLL__ hssize_t H5Sget_select_npoints (hid_t spaceid);
-__DLL__ herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
-				    const hssize_t start[],
-				    const hsize_t _stride[],
-				    const hsize_t count[],
-				    const hsize_t _block[]);
-__DLL__ herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op,
-				   size_t num_elemn,
-				   const hssize_t **coord);
-__DLL__ H5S_class_t H5Sget_simple_extent_type (hid_t space_id);
-__DLL__ herr_t H5Sset_extent_none (hid_t space_id);
-__DLL__ herr_t H5Sextent_copy (hid_t dst_id,hid_t src_id);
-__DLL__ herr_t H5Sselect_all (hid_t spaceid);
-__DLL__ herr_t H5Sselect_none (hid_t spaceid);
-__DLL__ herr_t H5Soffset_simple (hid_t space_id, const hssize_t *offset);
-__DLL__ htri_t H5Sselect_valid (hid_t spaceid);
+__DLL__ hid_t H5Screate_simple(int rank, const hsize_t dims[],
+			       const hsize_t maxdims[]);
+__DLL__ herr_t H5Sset_extent_simple(hid_t space_id, int rank,
+				    const hsize_t dims[],
+				    const hsize_t max[]);
+__DLL__ hid_t H5Scopy(hid_t space_id);
+__DLL__ herr_t H5Sclose(hid_t space_id);
+__DLL__ hsize_t H5Sget_simple_extent_npoints(hid_t space_id);
+__DLL__ int H5Sget_simple_extent_ndims(hid_t space_id);
+__DLL__ int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[],
+				      hsize_t maxdims[]);
+__DLL__ htri_t H5Sis_simple(hid_t space_id);
+__DLL__ herr_t H5Sset_space(hid_t space_id, int rank, const hsize_t *dims);
+__DLL__ hssize_t H5Sget_select_npoints(hid_t spaceid);
+__DLL__ herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op,
+				   const hssize_t start[],
+				   const hsize_t _stride[],
+				   const hsize_t count[],
+				   const hsize_t _block[]);
+__DLL__ herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op,
+				  size_t num_elemn,
+				  const hssize_t **coord);
+__DLL__ H5S_class_t H5Sget_simple_extent_type(hid_t space_id);
+__DLL__ herr_t H5Sset_extent_none(hid_t space_id);
+__DLL__ herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id);
+__DLL__ herr_t H5Sselect_all(hid_t spaceid);
+__DLL__ herr_t H5Sselect_none(hid_t spaceid);
+__DLL__ herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset);
+__DLL__ htri_t H5Sselect_valid(hid_t spaceid);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 270c47a..1b3f2cf 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -156,223 +156,317 @@ __DLLVAR__ size_t	H5T_NATIVE_DOUBLE_ALIGN_g;
 __DLLVAR__ size_t	H5T_NATIVE_LDOUBLE_ALIGN_g;
 
 /* Conversion functions */
-__DLL__ herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		      size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			     size_t nelmts, void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		       size_t nelmts, void *_buf, void *bkg);
-__DLL__ herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			      size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			       size_t nelmts, void *_buf, void *bkg);
 __DLL__ herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *buf, void __unused__ *bkg);
-__DLL__ herr_t H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *_buf, void *bkg);
-__DLL__ herr_t H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *_buf, void *bkg);
-__DLL__ herr_t H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *_buf, void *bkg);
+			     size_t nelmts, void *buf, void __unused__ *bkg);
+__DLL__ herr_t H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			    size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			    size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			    size_t nelmts, void *_buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id,
+				      H5T_cdata_t *cdata, size_t nelmts,
+				      void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id,
+				      H5T_cdata_t *cdata, size_t nelmts,
+				      void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_float_double(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_double_float(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_i32le_f64le(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *_buf, void *bkg);
 
 /* Bit twiddling functions */
-__DLL__ void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src,
-			   size_t src_offset, size_t size);
-__DLL__ void H5T_bit_set (uint8_t *buf, size_t offset, size_t size,
-			  hbool_t value);
-__DLL__ hsize_t H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size);
-__DLL__ void H5T_bit_set_d (uint8_t *buf, size_t offset, size_t size, hsize_t val);
-__DLL__ ssize_t H5T_bit_find (uint8_t *buf, size_t offset, size_t size,
-			      H5T_sdir_t direction, hbool_t value);
+__DLL__ void H5T_bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
+			  size_t src_offset, size_t size);
+__DLL__ void H5T_bit_set(uint8_t *buf, size_t offset, size_t size,
+			 hbool_t value);
+__DLL__ hsize_t H5T_bit_get_d(uint8_t *buf, size_t offset, size_t size);
+__DLL__ void H5T_bit_set_d(uint8_t *buf, size_t offset, size_t size,
+			   hsize_t val);
+__DLL__ ssize_t H5T_bit_find(uint8_t *buf, size_t offset, size_t size,
+			     H5T_sdir_t direction, hbool_t value);
 __DLL__ htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size);
 
 #endif
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 34fbf52..f37ebe9 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -73,23 +73,24 @@ __DLL__ herr_t H5T_close(H5T_t *dt);
 __DLL__ size_t H5T_get_size(const H5T_t *dt);
 __DLL__ intn H5T_cmp(const H5T_t *dt1, const H5T_t *dt2);
 __DLL__ htri_t H5T_is_atomic(const H5T_t *dt);
-__DLL__ herr_t H5T_struct_insert(H5T_t *parent, const char *name, size_t offset,
-			 intn ndims, const size_t *dim, const intn *perm,
-			 const H5T_t *member);
+__DLL__ herr_t H5T_struct_insert(H5T_t *parent, const char *name,
+				 size_t offset, intn ndims, const size_t *dim,
+				 const intn *perm, const H5T_t *member);
 __DLL__ herr_t H5T_enum_insert(H5T_t *dt, const char *name, void *value);
 __DLL__ herr_t H5T_pack(H5T_t *dt);
 __DLL__ herr_t H5T_debug(H5T_t *dt, FILE * stream);
 __DLL__ H5G_entry_t *H5T_entof(H5T_t *dt);
 __DLL__ H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst,
-			  const char *name, H5T_conv_t func);
+				  const char *name, H5T_conv_t func);
 __DLL__ herr_t H5T_sort_value(H5T_t *dt, int *map);
 __DLL__ herr_t H5T_sort_name(H5T_t *dt, int *map);
 __DLL__ herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id,
-		   size_t nelmts, void *buf, void *bkg);
+			   size_t nelmts, void *buf, void *bkg);
 __DLL__ herr_t H5T_set_size(H5T_t *dt, size_t size);
 __DLL__ herr_t H5T_set_precision(H5T_t *dt, size_t prec);
 __DLL__ herr_t H5T_set_offset(H5T_t *dt, size_t offset);
-__DLL__ char *H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size);
-__DLL__ herr_t H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/);
-
+__DLL__ char *H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/,
+			      size_t size);
+__DLL__ herr_t H5T_enum_valueof(H5T_t *dt, const char *name,
+				void *value/*out*/);
 #endif
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index c918765..495c63a 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -383,22 +383,22 @@ __DLLVAR__ hid_t H5T_NATIVE_HERR_g;
 __DLLVAR__ hid_t H5T_NATIVE_HBOOL_g;
    
 /* Operations defined on all data types */
-__DLL__ hid_t H5Topen (hid_t loc_id, const char *name);
-__DLL__ hid_t H5Tcreate (H5T_class_t type, size_t size);
-__DLL__ hid_t H5Tcopy (hid_t type_id);
-__DLL__ herr_t H5Tclose (hid_t type_id);
-__DLL__ htri_t H5Tequal (hid_t type1_id, hid_t type2_id);
-__DLL__ herr_t H5Tlock (hid_t type_id);
-__DLL__ herr_t H5Tcommit (hid_t loc_id, const char *name, hid_t type_id);
-__DLL__ htri_t H5Tcommitted (hid_t type_id);
+__DLL__ hid_t H5Topen(hid_t loc_id, const char *name);
+__DLL__ hid_t H5Tcreate(H5T_class_t type, size_t size);
+__DLL__ hid_t H5Tcopy(hid_t type_id);
+__DLL__ herr_t H5Tclose(hid_t type_id);
+__DLL__ htri_t H5Tequal(hid_t type1_id, hid_t type2_id);
+__DLL__ herr_t H5Tlock(hid_t type_id);
+__DLL__ herr_t H5Tcommit(hid_t loc_id, const char *name, hid_t type_id);
+__DLL__ htri_t H5Tcommitted(hid_t type_id);
 
 /* Operations defined on compound data types */
-__DLL__ herr_t H5Tinsert (hid_t parent_id, const char *name, size_t offset,
-                  hid_t member_id);
-__DLL__ herr_t H5Tinsert_array (hid_t parent_id, const char *name,
-				size_t offset, int ndims, const size_t dim[],
-				const int *perm, hid_t member_id);
-__DLL__ herr_t H5Tpack (hid_t type_id);
+__DLL__ herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset,
+			 hid_t member_id);
+__DLL__ herr_t H5Tinsert_array(hid_t parent_id, const char *name,
+			       size_t offset, int ndims, const size_t dim[],
+			       const int *perm, hid_t member_id);
+__DLL__ herr_t H5Tpack(hid_t type_id);
 
 /* Operations defined on enumeration data types */
 __DLL__ hid_t H5Tenum_create(hid_t base_id);
@@ -436,28 +436,28 @@ __DLL__ herr_t H5Tget_member_value(hid_t type_id, int membno,
 __DLL__ H5T_cset_t H5Tget_cset(hid_t type_id);
 
 /* Setting property values */
-__DLL__ herr_t H5Tset_size (hid_t type_id, size_t size);
-__DLL__ herr_t H5Tset_order (hid_t type_id, H5T_order_t order);
-__DLL__ herr_t H5Tset_precision (hid_t type_id, size_t prec);
-__DLL__ herr_t H5Tset_offset (hid_t type_id, size_t offset);
-__DLL__ herr_t H5Tset_pad (hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
-__DLL__ herr_t H5Tset_sign (hid_t type_id, H5T_sign_t sign);
-__DLL__ herr_t H5Tset_fields (hid_t type_id, size_t spos, size_t epos,
-			      size_t esize, size_t mpos, size_t msize);
-__DLL__ herr_t H5Tset_ebias (hid_t type_id, size_t ebias);
-__DLL__ herr_t H5Tset_norm (hid_t type_id, H5T_norm_t norm);
-__DLL__ herr_t H5Tset_inpad (hid_t type_id, H5T_pad_t pad);
-__DLL__ herr_t H5Tset_cset (hid_t type_id, H5T_cset_t cset);
-__DLL__ herr_t H5Tset_strpad (hid_t type_id, H5T_str_t strpad);
+__DLL__ herr_t H5Tset_size(hid_t type_id, size_t size);
+__DLL__ herr_t H5Tset_order(hid_t type_id, H5T_order_t order);
+__DLL__ herr_t H5Tset_precision(hid_t type_id, size_t prec);
+__DLL__ herr_t H5Tset_offset(hid_t type_id, size_t offset);
+__DLL__ herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
+__DLL__ herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign);
+__DLL__ herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos,
+			     size_t esize, size_t mpos, size_t msize);
+__DLL__ herr_t H5Tset_ebias(hid_t type_id, size_t ebias);
+__DLL__ herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm);
+__DLL__ herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad);
+__DLL__ herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset);
+__DLL__ herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad);
 
 /* Type conversion database */
 __DLL__ herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id,
 			   hid_t dst_id, H5T_conv_t func);
-__DLL__ herr_t H5Tunregister (H5T_pers_t pers, const char *name, hid_t src_id,
-			      hid_t dst_id, H5T_conv_t func);
-__DLL__ H5T_conv_t H5Tfind (hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
-__DLL__ herr_t H5Tconvert (hid_t src_id, hid_t dst_id, size_t nelmts,
-			   void *buf, void *background);
+__DLL__ herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id,
+			     hid_t dst_id, H5T_conv_t func);
+__DLL__ H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
+__DLL__ herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts,
+			  void *buf, void *background);
 __DLL__ H5T_overflow_t H5Tget_overflow(void);
 __DLL__ herr_t H5Tset_overflow(H5T_overflow_t func);
 
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index 1cd0d09..1e49594 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -35,13 +35,16 @@
 #define H5V_ZERO        NULL
 
 __DLL__ hsize_t H5V_hyper_stride(intn n, const hsize_t *size,
-			 const hsize_t *total_size, const hssize_t *offset,
-			 hssize_t *stride);
+				 const hsize_t *total_size,
+				 const hssize_t *offset,
+				 hssize_t *stride);
 __DLL__ htri_t H5V_hyper_disjointp(intn n, const hssize_t *offset1,
-			   const hsize_t *size1, const hssize_t *offset2,
-			   const hsize_t *size2);
-__DLL__ htri_t H5V_hyper_eq(intn n, const hssize_t *offset1, const hsize_t *size1,
-		    const hssize_t *offset2, const hsize_t *size2);
+				   const hsize_t *size1,
+				   const hssize_t *offset2,
+				   const hsize_t *size2);
+__DLL__ htri_t H5V_hyper_eq(intn n, const hssize_t *offset1,
+			    const hsize_t *size1, const hssize_t *offset2,
+			    const hsize_t *size2);
 __DLL__ herr_t H5V_hyper_fill(intn n, const hsize_t *_size,
 			      const hsize_t *total_size,
 			      const hssize_t *offset, void *_dst,
@@ -52,19 +55,23 @@ __DLL__ herr_t H5V_hyper_copy(intn n, const hsize_t *size,
 			      const hsize_t *src_total_size,
 			      const hssize_t *src_offset, const void *_src);
 __DLL__ herr_t H5V_stride_fill(intn n, hsize_t elmt_size, const hsize_t *size,
-		       const hssize_t *stride, void *_dst, uintn fill_value);
+			       const hssize_t *stride, void *_dst,
+			       uintn fill_value);
 __DLL__ herr_t H5V_stride_copy(intn n, hsize_t elmt_size, const hsize_t *_size,
 			       const hssize_t *dst_stride, void *_dst,
 			       const hssize_t *src_stride, const void *_src);
 __DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n,
-			const hsize_t *dst_size, const hssize_t *dst_stride,
-			void *_dst, intn src_n, const hsize_t *src_size,
-			const hssize_t *src_stride, const void *_src);
-__DLL__ herr_t H5V_stride_optimize1(intn *np, hsize_t *elmt_size, hsize_t *size,
-			    hssize_t *stride1);
-__DLL__ herr_t H5V_stride_optimize2(intn *np, hsize_t *elmt_size, hsize_t *size,
-			    hssize_t *stride1, hssize_t *stride2);
-__DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size, size_t count);
+				const hsize_t *dst_size,
+				const hssize_t *dst_stride, void *_dst,
+				intn src_n, const hsize_t *src_size,
+				const hssize_t *src_stride, const void *_src);
+__DLL__ herr_t H5V_stride_optimize1(intn *np, hsize_t *elmt_size,
+				    hsize_t *size, hssize_t *stride1);
+__DLL__ herr_t H5V_stride_optimize2(intn *np, hsize_t *elmt_size,
+				    hsize_t *size, hssize_t *stride1,
+				    hssize_t *stride2);
+__DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size,
+			      size_t count);
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h
index c5ff1d5..4e22144 100644
--- a/src/H5Zprivate.h
+++ b/src/H5Zprivate.h
@@ -30,12 +30,15 @@ typedef struct H5Z_class_t {
 
 struct H5O_pline_t; /*forward decl*/
 
-__DLL__ herr_t H5Z_register(H5Z_filter_t id, const char *comment, H5Z_func_t filter);
-__DLL__ herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter, uintn flags,
-		  size_t cd_nelmts, const unsigned int cd_values[]);
-__DLL__ herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline, uintn flags,
-		    uintn *filter_mask/*in,out*/, size_t *nbytes/*in,out*/,
-		    size_t *buf_size/*in,out*/, void **buf/*in,out*/);
+__DLL__ herr_t H5Z_register(H5Z_filter_t id, const char *comment,
+			    H5Z_func_t filter);
+__DLL__ herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter,
+			  uintn flags, size_t cd_nelmts,
+			  const unsigned int cd_values[]);
+__DLL__ herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline,
+			    uintn flags, uintn *filter_mask/*in,out*/,
+			    size_t *nbytes/*in,out*/,
+			    size_t *buf_size/*in,out*/, void **buf/*in,out*/);
 __DLL__ H5Z_class_t *H5Z_find(H5Z_filter_t id);
 
 
diff --git a/src/H5private.h b/src/H5private.h
index 0088432..fac7fa1 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -775,7 +775,8 @@ extern H5_debug_t		H5_debug_g;
 #define H5TRACE_RETURN(V)		   /*void*/
 #endif
 
-__DLL__ void H5_trace (hbool_t returning, const char *func, const char *type, ...);
+__DLL__ void H5_trace(hbool_t returning, const char *func, const char *type,
+		      ...);
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5public.h b/src/H5public.h
index 220e626..19a1f8a 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -101,13 +101,13 @@ extern "C" {
 #endif
 
 /* Functions in H5.c */
-__DLL__ herr_t H5open (void);
-__DLL__ herr_t H5close (void);
-__DLL__ herr_t H5dont_atexit (void);
-__DLL__ herr_t H5get_libversion (unsigned *majnum, unsigned *minnum,
-				 unsigned *relnum);
-__DLL__ herr_t H5check_version (unsigned majnum, unsigned minnum,
-				unsigned relnum);
+__DLL__ herr_t H5open(void);
+__DLL__ herr_t H5close(void);
+__DLL__ herr_t H5dont_atexit(void);
+__DLL__ herr_t H5get_libversion(unsigned *majnum, unsigned *minnum,
+				unsigned *relnum);
+__DLL__ herr_t H5check_version(unsigned majnum, unsigned minnum,
+			       unsigned relnum);
 
 #ifdef __cplusplus
 }
author	Robb Matzke <matzke@llnl.gov>	1999-02-18 16:21:34 (GMT)
committer	Robb Matzke <matzke@llnl.gov>	1999-02-18 16:21:34 (GMT)
commit	37cfaf1665f1a036c4a907367c7e25b7ac849013 (patch)
tree	cbdea15114da44de5f1d74057fdb8de449d18f41 /src
parent	901051cecb91bffb1920c0b31bec2f0661363a1a (diff)
download	hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.zip hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.tar.gz hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.tar.bz2