[svn-r1847] ** src/H5T.c

	Fixed a bug with enumeration types not having the correct object
	header pointer.

3 files changed, 1081 insertions, 952 deletions

diff --git a/src/Dependencies b/src/Dependencies
index 42d9b41..5017958 100644
--- a/src/Dependencies
+++ b/src/Dependencies
@@ -5,8 +5,9 @@ H5.lo: \
    $(srcdir)/H5.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -42,8 +43,9 @@ H5A.lo: \
    $(srcdir)/H5A.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Bprivate.h \
@@ -79,8 +81,9 @@ H5AC.lo: \
    $(srcdir)/H5AC.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -94,8 +97,9 @@ H5B.lo: \
    $(srcdir)/H5B.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -117,8 +121,9 @@ H5D.lo: \
    $(srcdir)/H5D.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5ACprivate.h \
@@ -158,8 +163,9 @@ H5E.lo: \
    $(srcdir)/H5E.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Eprivate.h \
@@ -170,7 +176,7 @@ H5F.lo: \
    $(srcdir)/H5FDcore.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
    $(srcdir)/H5FDfamily.h \
    $(srcdir)/H5FDmpio.h \
@@ -180,6 +186,7 @@ H5F.lo: \
    $(srcdir)/H5FDsec2.h \
    $(srcdir)/H5FDstdio.h \
    $(srcdir)/H5private.h \
+   H5config.h \
    $(srcdir)/H5Aprivate.h \
    $(srcdir)/H5Apublic.h \
    $(srcdir)/H5Gprivate.h \
@@ -215,8 +222,9 @@ H5Farray.lo: \
    $(srcdir)/H5Farray.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Dprivate.h \
    $(srcdir)/H5Dpublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -250,8 +258,9 @@ H5Fistore.lo: \
    $(srcdir)/H5Fistore.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Dprivate.h \
    $(srcdir)/H5Dpublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -287,8 +296,9 @@ H5FD.lo: \
    $(srcdir)/H5FD.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -306,8 +316,9 @@ H5FDsec2.lo: \
    $(srcdir)/H5FDsec2.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -323,8 +334,9 @@ H5FDfamily.lo: \
    $(srcdir)/H5FDfamily.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -340,8 +352,9 @@ H5FDmpio.lo: \
    $(srcdir)/H5FDmpio.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -357,8 +370,9 @@ H5FDcore.lo: \
    $(srcdir)/H5FDcore.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -374,7 +388,7 @@ H5FDmulti.lo: \
    $(srcdir)/H5FDmulti.c \
    $(srcdir)/hdf5.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Apublic.h \
@@ -406,8 +420,9 @@ H5FDgass.lo: \
    $(srcdir)/H5FDgass.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -423,7 +438,7 @@ H5FDstdio.lo: \
    $(srcdir)/H5FDstdio.c \
    $(srcdir)/hdf5.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Apublic.h \
@@ -455,8 +470,9 @@ H5G.lo: \
    $(srcdir)/H5G.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Aprivate.h \
    $(srcdir)/H5Apublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -496,8 +512,9 @@ H5Gent.lo: \
    $(srcdir)/H5Gent.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -517,8 +534,9 @@ H5Gnode.lo: \
    $(srcdir)/H5Gnode.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -556,8 +574,9 @@ H5Gstab.lo: \
    $(srcdir)/H5Gstab.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -591,8 +610,9 @@ H5HG.lo: \
    $(srcdir)/H5HG.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -612,8 +632,9 @@ H5HL.lo: \
    $(srcdir)/H5HL.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -635,8 +656,9 @@ H5I.lo: \
    $(srcdir)/H5I.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Eprivate.h \
@@ -646,8 +668,9 @@ H5MF.lo: \
    $(srcdir)/H5MF.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -659,8 +682,9 @@ H5MM.lo: \
    $(srcdir)/H5MM.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h
@@ -668,8 +692,9 @@ H5O.lo: \
    $(srcdir)/H5O.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5ACprivate.h \
    $(srcdir)/H5ACpublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -705,8 +730,9 @@ H5Oattr.lo: \
    $(srcdir)/H5Oattr.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -738,8 +764,9 @@ H5Ocomp.lo: \
    $(srcdir)/H5Ocomp.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -767,8 +794,9 @@ H5Ocont.lo: \
    $(srcdir)/H5Ocont.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -796,8 +824,9 @@ H5Odtype.lo: \
    $(srcdir)/H5Odtype.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -827,8 +856,9 @@ H5Oefl.lo: \
    $(srcdir)/H5Oefl.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -858,8 +888,9 @@ H5Ofill.lo: \
    $(srcdir)/H5Ofill.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -891,8 +922,9 @@ H5Olayout.lo: \
    $(srcdir)/H5Olayout.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Dprivate.h \
    $(srcdir)/H5Dpublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -922,8 +954,9 @@ H5Omtime.lo: \
    $(srcdir)/H5Omtime.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -951,8 +984,9 @@ H5Oname.lo: \
    $(srcdir)/H5Oname.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -980,8 +1014,9 @@ H5Onull.lo: \
    $(srcdir)/H5Onull.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Oprivate.h \
    $(srcdir)/H5Opublic.h \
    $(srcdir)/H5Fprivate.h \
@@ -1007,8 +1042,9 @@ H5Osdspace.lo: \
    $(srcdir)/H5Osdspace.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1036,8 +1072,9 @@ H5Oshared.lo: \
    $(srcdir)/H5Oshared.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1065,8 +1102,9 @@ H5Ostab.lo: \
    $(srcdir)/H5Ostab.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1094,8 +1132,9 @@ H5P.lo: \
    $(srcdir)/H5P.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Bprivate.h \
@@ -1129,8 +1168,9 @@ H5R.lo: \
    $(srcdir)/H5R.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Dprivate.h \
@@ -1162,11 +1202,12 @@ H5RA.lo: \
    $(srcdir)/H5RApublic.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
    $(srcdir)/H5Dprivate.h \
    $(srcdir)/H5Dpublic.h \
    $(srcdir)/H5private.h \
+   H5config.h \
    $(srcdir)/H5Fprivate.h \
    $(srcdir)/H5Fpublic.h \
    $(srcdir)/H5FDpublic.h \
@@ -1196,8 +1237,9 @@ H5S.lo: \
    $(srcdir)/H5S.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Eprivate.h \
@@ -1227,8 +1269,9 @@ H5Sall.lo: \
    $(srcdir)/H5Sall.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1258,8 +1301,9 @@ H5Shyper.lo: \
    $(srcdir)/H5Shyper.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Dprivate.h \
    $(srcdir)/H5Dpublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1293,8 +1337,9 @@ H5Smpio.lo: \
    $(srcdir)/H5Smpio.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1324,8 +1369,9 @@ H5Snone.lo: \
    $(srcdir)/H5Snone.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1355,8 +1401,9 @@ H5Spoint.lo: \
    $(srcdir)/H5Spoint.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1388,8 +1435,9 @@ H5Sselect.lo: \
    $(srcdir)/H5Sselect.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1417,47 +1465,13 @@ H5Sselect.lo: \
    $(srcdir)/H5Zprivate.h \
    $(srcdir)/H5Zpublic.h \
    $(srcdir)/H5Vprivate.h
-H5T.lo: \
-   $(srcdir)/H5T.c \
-   $(srcdir)/H5private.h \
-   $(srcdir)/H5public.h \
-   H5config.h \
-   $(srcdir)/H5api_adpt.h \
-   $(srcdir)/H5Dprivate.h \
-   $(srcdir)/H5Dpublic.h \
-   $(srcdir)/H5Ipublic.h \
-   $(srcdir)/H5Fprivate.h \
-   $(srcdir)/H5Fpublic.h \
-   $(srcdir)/H5FDpublic.h \
-   $(srcdir)/H5MMpublic.h \
-   $(srcdir)/H5Gprivate.h \
-   $(srcdir)/H5Gpublic.h \
-   $(srcdir)/H5Bprivate.h \
-   $(srcdir)/H5Bpublic.h \
-   $(srcdir)/H5Oprivate.h \
-   $(srcdir)/H5Opublic.h \
-   $(srcdir)/H5HGprivate.h \
-   $(srcdir)/H5HGpublic.h \
-   $(srcdir)/H5Tprivate.h \
-   $(srcdir)/H5Tpublic.h \
-   $(srcdir)/H5Rprivate.h \
-   $(srcdir)/H5Rpublic.h \
-   $(srcdir)/H5Sprivate.h \
-   $(srcdir)/H5Spublic.h \
-   $(srcdir)/H5Zprivate.h \
-   $(srcdir)/H5Zpublic.h \
-   $(srcdir)/H5Iprivate.h \
-   $(srcdir)/H5Eprivate.h \
-   $(srcdir)/H5Epublic.h \
-   $(srcdir)/H5MMprivate.h \
-   $(srcdir)/H5Pprivate.h \
-   $(srcdir)/H5Ppublic.h
 H5Tbit.lo: \
    $(srcdir)/H5Tbit.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1480,9 +1494,10 @@ H5Tconv.lo: \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
    $(srcdir)/H5private.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5MMprivate.h \
@@ -1508,8 +1523,9 @@ H5Tinit.lo: \
    H5Tinit.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Eprivate.h \
@@ -1533,8 +1549,9 @@ H5Tvlen.lo: \
    $(srcdir)/H5Tvlen.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1558,8 +1575,9 @@ H5TB.lo: \
    $(srcdir)/H5TB.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Iprivate.h \
    $(srcdir)/H5Ipublic.h \
    $(srcdir)/H5Eprivate.h \
@@ -1569,8 +1587,9 @@ H5V.lo: \
    $(srcdir)/H5V.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1598,8 +1617,9 @@ H5Z.lo: \
    $(srcdir)/H5Z.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1627,8 +1647,9 @@ H5Zdeflate.lo: \
    $(srcdir)/H5Zdeflate.c \
    $(srcdir)/H5private.h \
    $(srcdir)/H5public.h \
-   H5config.h \
+   H5pubconf.h \
    $(srcdir)/H5api_adpt.h \
+   H5config.h \
    $(srcdir)/H5Eprivate.h \
    $(srcdir)/H5Epublic.h \
    $(srcdir)/H5Ipublic.h \
@@ -1639,3 +1660,39 @@ H5Zdeflate.lo: \
    $(srcdir)/H5Fprivate.h \
    $(srcdir)/H5Fpublic.h \
    $(srcdir)/H5FDpublic.h
+H5T.lo: \
+   $(srcdir)/H5T.c \
+   $(srcdir)/H5private.h \
+   $(srcdir)/H5public.h \
+   H5pubconf.h \
+   $(srcdir)/H5api_adpt.h \
+   H5config.h \
+   $(srcdir)/H5Dprivate.h \
+   $(srcdir)/H5Dpublic.h \
+   $(srcdir)/H5Ipublic.h \
+   $(srcdir)/H5Fprivate.h \
+   $(srcdir)/H5Fpublic.h \
+   $(srcdir)/H5FDpublic.h \
+   $(srcdir)/H5MMpublic.h \
+   $(srcdir)/H5Gprivate.h \
+   $(srcdir)/H5Gpublic.h \
+   $(srcdir)/H5Bprivate.h \
+   $(srcdir)/H5Bpublic.h \
+   $(srcdir)/H5Oprivate.h \
+   $(srcdir)/H5Opublic.h \
+   $(srcdir)/H5HGprivate.h \
+   $(srcdir)/H5HGpublic.h \
+   $(srcdir)/H5Tprivate.h \
+   $(srcdir)/H5Tpublic.h \
+   $(srcdir)/H5Rprivate.h \
+   $(srcdir)/H5Rpublic.h \
+   $(srcdir)/H5Sprivate.h \
+   $(srcdir)/H5Spublic.h \
+   $(srcdir)/H5Zprivate.h \
+   $(srcdir)/H5Zpublic.h \
+   $(srcdir)/H5Iprivate.h \
+   $(srcdir)/H5Eprivate.h \
+   $(srcdir)/H5Epublic.h \
+   $(srcdir)/H5MMprivate.h \
+   $(srcdir)/H5Pprivate.h \
+   $(srcdir)/H5Ppublic.h
diff --git a/src/H5T.c b/src/H5T.c
index 0f6e766..39459f5 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -3627,6 +3627,7 @@ H5Tenum_create(hid_t parent_id)
     dt->type = H5T_ENUM;
     dt->parent = H5T_copy(parent, H5T_COPY_ALL);
     dt->size = dt->parent->size;
+    dt->ent.header = HADDR_UNDEF;
 
     /* Atomize the type */
     if ((ret_value=H5I_register(H5I_DATATYPE, dt))<0) {
@@ -4085,43 +4086,44 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
 
     /* Check args */
     if (H5T_PERS_HARD!=pers && H5T_PERS_SOFT!=pers) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
 		    "invalid function persistence");
     }
     if (!name || !*name) {
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
+	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
 		     "conversion must have a name for debugging");
     }
     if (H5I_DATATYPE!=H5I_get_type(src_id) ||
-            NULL==(src=H5I_object(src_id)) ||
-            H5I_DATATYPE!=H5I_get_type(dst_id) ||
-            NULL==(dst=H5I_object(dst_id))) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+	NULL==(src=H5I_object(src_id)) ||
+	H5I_DATATYPE!=H5I_get_type(dst_id) ||
+	NULL==(dst=H5I_object(dst_id))) {
+	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
     }
     if (!func) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
 		    "no conversion function specified");
     }
 
     if (H5T_PERS_HARD==pers) {
-        /* Locate or create a new conversion path */
-        if (NULL==(new_path=H5T_path_find(src, dst, name, func))) {
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                "unable to locate/allocate conversion path");
-        }
-        
-        /*
-         * Notify all other functions to recalculate private data since some
-         * functions might cache a list of conversion functions.  For
-         * instance, the compound type converter caches a list of conversion
-         * functions for the members, so adding a new function should cause
-         * the list to be recalculated to use the new function.
-         */
-        for (i=0; i<H5T_g.npaths; i++) {
-            if (new_path != H5T_g.path[i])
-                H5T_g.path[i]->cdata.recalc = TRUE;
-        }
-        
+	/* Locate or create a new conversion path */
+	if (NULL==(new_path=H5T_path_find(src, dst, name, func))) {
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			"unable to locate/allocate conversion path");
+	}
+	
+	/*
+	 * Notify all other functions to recalculate private data since some
+	 * functions might cache a list of conversion functions.  For
+	 * instance, the compound type converter caches a list of conversion
+	 * functions for the members, so adding a new function should cause
+	 * the list to be recalculated to use the new function.
+	 */
+	for (i=0; i<H5T_g.npaths; i++) {
+	    if (new_path != H5T_g.path[i]) {
+		H5T_g.path[i]->cdata.recalc = TRUE;
+	    }
+	}
+	
     } else {
         /* Add function to end of soft list */
         if (H5T_g.nsoft>=H5T_g.asoft) {
@@ -4200,11 +4202,11 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
             if ((old_path->func)(tmp_sid, tmp_did, &(old_path->cdata),
                      0, 0, NULL, NULL, H5P_DEFAULT)<0) {
 #ifdef H5T_DEBUG
-                if (H5DEBUG(T)) {
-                    fprintf (H5DEBUG(T), "H5T: conversion function 0x%08lx "
-                         "failed to free private data for %s (ignored)\n",
-                         (unsigned long)(old_path->func), old_path->name);
-                }
+		if (H5DEBUG(T)) {
+		    fprintf (H5DEBUG(T), "H5T: conversion function 0x%08lx "
+			     "failed to free private data for %s (ignored)\n",
+			     (unsigned long)(old_path->func), old_path->name);
+		}
 #endif
             }
             H5T_close(old_path->src);
@@ -4225,17 +4227,13 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
 
  done:
     if (ret_value<0) {
-        if (new_path) {
-            if (new_path->src)
-                H5T_close(new_path->src);
-            if (new_path->dst)
-                H5T_close(new_path->dst);
-            H5MM_xfree(new_path);
-        }
-        if (tmp_sid>=0)
-            H5I_dec_ref(tmp_sid);
-        if (tmp_did>=0)
-            H5I_dec_ref(tmp_did);
+	if (new_path) {
+	    if (new_path->src) H5T_close(new_path->src);
+	    if (new_path->dst) H5T_close(new_path->dst);
+	    H5MM_xfree(new_path);
+	}
+	if (tmp_sid>=0) H5I_dec_ref(tmp_sid);
+	if (tmp_did>=0) H5I_dec_ref(tmp_did);
     }
     FUNC_LEAVE(ret_value);
 }
@@ -4307,11 +4305,11 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
         path->cdata.command = H5T_CONV_FREE;
         if ((path->func)(FAIL, FAIL, &(path->cdata), 0, 0, NULL, NULL, H5P_DEFAULT)<0) {
 #ifdef H5T_DEBUG
-            if (H5DEBUG(T)) {
-                fprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx failed "
-                    "to free private data for %s (ignored)\n",
-                    (unsigned long)(path->func), path->name);
-            }
+	    if (H5DEBUG(T)) {
+		fprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx failed "
+			"to free private data for %s (ignored)\n",
+			(unsigned long)(path->func), path->name);
+	    }
 #endif
         }
         H5T_close(path->src);
@@ -4815,41 +4813,41 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method)
     }
 
     switch (method) {
-        case H5T_COPY_TRANSIENT:
-            /*
-             * Return an unlocked transient type.
-             */
-            new_dt->state = H5T_STATE_TRANSIENT;
-            HDmemset (&(new_dt->ent), 0, sizeof(new_dt->ent));
-            new_dt->ent.header = HADDR_UNDEF;
-            break;
-        
-        case H5T_COPY_ALL:
-            /*
-             * Return a transient type (locked or unlocked) or an unopened named
-             * type.  Immutable transient types are degraded to read-only.
-             */
-            if (H5T_STATE_OPEN==new_dt->state) {
-                new_dt->state = H5T_STATE_NAMED;
-            } else if (H5T_STATE_IMMUTABLE==new_dt->state) {
-                new_dt->state = H5T_STATE_RDONLY;
-            }
-            break;
-
-        case H5T_COPY_REOPEN:
-            /*
-             * Return a transient type (locked or unlocked) or an opened named
-             * type.
-             */
-            if (H5F_addr_defined(new_dt->ent.header)) {
-                if (H5O_open (&(new_dt->ent))<0) {
-                    H5MM_xfree (new_dt);
-                    HRETURN_ERROR (H5E_DATATYPE, H5E_CANTOPENOBJ, NULL,
-                           "unable to reopen named data type");
-                }
-                new_dt->state = H5T_STATE_OPEN;
-            }
-            break;
+    case H5T_COPY_TRANSIENT:
+	/*
+	 * Return an unlocked transient type.
+	 */
+	new_dt->state = H5T_STATE_TRANSIENT;
+	HDmemset (&(new_dt->ent), 0, sizeof(new_dt->ent));
+	new_dt->ent.header = HADDR_UNDEF;
+	break;
+	
+    case H5T_COPY_ALL:
+	/*
+	 * Return a transient type (locked or unlocked) or an unopened named
+	 * type.  Immutable transient types are degraded to read-only.
+	 */
+	if (H5T_STATE_OPEN==new_dt->state) {
+	    new_dt->state = H5T_STATE_NAMED;
+	} else if (H5T_STATE_IMMUTABLE==new_dt->state) {
+	    new_dt->state = H5T_STATE_RDONLY;
+	}
+	break;
+
+    case H5T_COPY_REOPEN:
+	/*
+	 * Return a transient type (locked or unlocked) or an opened named
+	 * type.
+	 */
+	if (H5F_addr_defined(new_dt->ent.header)) {
+	    if (H5O_open (&(new_dt->ent))<0) {
+		H5MM_xfree (new_dt);
+		HRETURN_ERROR (H5E_DATATYPE, H5E_CANTOPENOBJ, NULL,
+			       "unable to reopen named data type");
+	    }
+	    new_dt->state = H5T_STATE_OPEN;
+	}
+	break;
     }
     
     if (H5T_COMPOUND == new_dt->type) {
@@ -4895,23 +4893,25 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method)
         new_dt->size += accum_change;
 
     } else if (H5T_ENUM == new_dt->type) {
-        /*
-         * Copy all member fields to new type, then overwrite the name fields
-         * of each new member with copied values. That is, H5T_copy() is a
-         * deep copy.
-         */
-        new_dt->u.enumer.name = H5MM_malloc(new_dt->u.enumer.nalloc * sizeof(char*));
-        new_dt->u.enumer.value = H5MM_malloc(new_dt->u.enumer.nalloc * new_dt->size);
-        if (NULL==new_dt->u.enumer.value) {
-            HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                  "memory allocation failed");
-        }
-        HDmemcpy(new_dt->u.enumer.value, old_dt->u.enumer.value,
-             new_dt->u.enumer.nmembs * new_dt->size);
-        for (i=0; i<new_dt->u.enumer.nmembs; i++) {
-            s = old_dt->u.enumer.name[i];
-            new_dt->u.enumer.name[i] = H5MM_xstrdup(s);
-        } 
+	/*
+	 * Copy all member fields to new type, then overwrite the name fields
+	 * of each new member with copied values. That is, H5T_copy() is a
+	 * deep copy.
+	 */
+	new_dt->u.enumer.name = H5MM_malloc(new_dt->u.enumer.nalloc *
+					    sizeof(char*));
+	new_dt->u.enumer.value = H5MM_malloc(new_dt->u.enumer.nalloc *
+					     new_dt->size);
+	if (NULL==new_dt->u.enumer.value) {
+	    HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+			  "memory allocation failed");
+	}
+	HDmemcpy(new_dt->u.enumer.value, old_dt->u.enumer.value,
+		 new_dt->u.enumer.nmembs * new_dt->size);
+	for (i=0; i<new_dt->u.enumer.nmembs; i++) {
+	    s = old_dt->u.enumer.name[i];
+	    new_dt->u.enumer.name[i] = H5MM_xstrdup(s);
+    } 
     } else if (H5T_VLEN == new_dt->type) {
         if(method==H5T_COPY_TRANSIENT || method==H5T_COPY_REOPEN) {
             /* H5T_copy converts any VL type into a memory VL type */
@@ -5555,60 +5555,59 @@ H5T_struct_insert(H5T_t *parent, const char *name, size_t offset, intn ndims,
     assert(name && *name);
 
     /* Does NAME already exist in PARENT? */
-    for (i=0; i<parent->u.compnd.nmembs; i++)
-        if (!HDstrcmp(parent->u.compnd.memb[i].name, name)) {
-            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL,
-                  "member name is not unique");
-        }
+    for (i=0; i<parent->u.compnd.nmembs; i++) {
+	if (!HDstrcmp(parent->u.compnd.memb[i].name, name)) {
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL,
+			  "member name is not unique");
+	}
+    }
 
     /* Does the new member overlap any existing member ? */
-    for (total_size=member->size, i=0; i<ndims; i++)
-        total_size *= dim[i];
+    for (total_size=member->size, i=0; i<ndims; i++) total_size *= dim[i];
     for (i=0; i<parent->u.compnd.nmembs; i++) {
-        if ((offset <= parent->u.compnd.memb[i].offset &&
-             offset + total_size > parent->u.compnd.memb[i].offset) ||
-            (parent->u.compnd.memb[i].offset <= offset &&
-             parent->u.compnd.memb[i].offset +
-             parent->u.compnd.memb[i].size > offset)) {
-            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL,
-                  "member overlaps with another member");
-        }
+	if ((offset <= parent->u.compnd.memb[i].offset &&
+	     offset + total_size > parent->u.compnd.memb[i].offset) ||
+	    (parent->u.compnd.memb[i].offset <= offset &&
+	     parent->u.compnd.memb[i].offset +
+	     parent->u.compnd.memb[i].size > offset)) {
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL,
+			  "member overlaps with another member");
+	}
     }
 
     /* Are permutations correct? */
     if (ndims>0 && perm) {
-        if (NULL==(perm_check=H5MM_calloc(ndims*sizeof(hbool_t)))) {
-            HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
-                  "memory allocation failed");
-        }
-        for (i=0; i<ndims; i++) {
-            if (perm[i]<0 || perm[i]>=ndims) {
-                H5MM_xfree(perm_check);
-                HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                      "invalid permutation vector (out of range)");
-            }
-            if (perm_check[perm[i]]) {
-                H5MM_xfree(perm_check);
-                HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                      "invalid permutation vector (duplicate value)");
-            }
-            perm_check[perm[i]] = TRUE;
-        }
-        perm_check = H5MM_xfree(perm_check);
+	if (NULL==(perm_check=H5MM_calloc(ndims*sizeof(hbool_t)))) {
+	    HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+			  "memory allocation failed");
+	}
+	for (i=0; i<ndims; i++) {
+	    if (perm[i]<0 || perm[i]>=ndims) {
+		H5MM_xfree(perm_check);
+		HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+			      "invalid permutation vector (out of range)");
+	    }
+	    if (perm_check[perm[i]]) {
+		H5MM_xfree(perm_check);
+		HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
+			      "invalid permutation vector (duplicate value)");
+	    }
+	    perm_check[perm[i]] = TRUE;
+	}
+	perm_check = H5MM_xfree(perm_check);
     }
     
     /* Increase member array if necessary */
     if (parent->u.compnd.nmembs >= parent->u.compnd.nalloc) {
-        size_t na = parent->u.compnd.nalloc + H5T_COMPND_INC;
-        H5T_cmemb_t *x = H5MM_realloc (parent->u.compnd.memb,
-                           na * sizeof(H5T_cmemb_t));
-
-        if (!x) {
-            HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
-                   "memory allocation failed");
-        }
-        parent->u.compnd.nalloc = (intn)na;
-        parent->u.compnd.memb = x;
+	size_t na = parent->u.compnd.nalloc + H5T_COMPND_INC;
+	H5T_cmemb_t *x = H5MM_realloc (parent->u.compnd.memb,
+				       na * sizeof(H5T_cmemb_t));
+	if (!x) {
+	    HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
+			   "memory allocation failed");
+	}
+	parent->u.compnd.nalloc = (intn)na;
+	parent->u.compnd.memb = x;
     }
 
     /* Add member to end of member array */
@@ -6156,164 +6155,162 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2)
     if (dt1->parent && !dt2->parent) HGOTO_DONE(-1);
     if (!dt1->parent && dt2->parent) HGOTO_DONE(1);
     if (dt1->parent) {
-        tmp = H5T_cmp(dt1->parent, dt2->parent);
-        if (tmp<0) HGOTO_DONE(-1);
-        if (tmp>0) HGOTO_DONE(1);
+	tmp = H5T_cmp(dt1->parent, dt2->parent);
+	if (tmp<0) HGOTO_DONE(-1);
+	if (tmp>0) HGOTO_DONE(1);
     }
 
     if (H5T_COMPOUND == dt1->type) {
-        /*
-         * Compound data types...
-         */
-        if (dt1->u.compnd.nmembs < dt2->u.compnd.nmembs) HGOTO_DONE(-1);
-        if (dt1->u.compnd.nmembs > dt2->u.compnd.nmembs) HGOTO_DONE(1);
+	/*
+	 * Compound data types...
+	 */
+	if (dt1->u.compnd.nmembs < dt2->u.compnd.nmembs) HGOTO_DONE(-1);
+	if (dt1->u.compnd.nmembs > dt2->u.compnd.nmembs) HGOTO_DONE(1);
 
-        /* Build an index for each type so the names are sorted */
-        if (NULL==(idx1 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(intn))) ||
-            NULL==(idx2 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(intn)))) {
-            HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, 0,
-                   "memory allocation failed");
-        }
-        for (i=0; i<dt1->u.compnd.nmembs; i++)
-            idx1[i] = idx2[i] = i;
-        for (i=dt1->u.compnd.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
-            for (j=0, swapped=FALSE; j<i; j++) {
-                if (HDstrcmp(dt1->u.compnd.memb[idx1[j]].name,
-                         dt1->u.compnd.memb[idx1[j+1]].name) > 0) {
-                    tmp = idx1[j];
-                    idx1[j] = idx1[j+1];
-                    idx1[j+1] = tmp;
-                    swapped = TRUE;
-                }
-            }
-        }
-        for (i=dt2->u.compnd.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
-            for (j=0, swapped=FALSE; j<i; j++) {
-                if (HDstrcmp(dt2->u.compnd.memb[idx2[j]].name,
-                         dt2->u.compnd.memb[idx2[j+1]].name) > 0) {
-                    tmp = idx2[j];
-                    idx2[j] = idx2[j+1];
-                    idx2[j+1] = tmp;
-                    swapped = TRUE;
-                }
-            }
-        }
+	/* Build an index for each type so the names are sorted */
+	if (NULL==(idx1 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(intn))) ||
+	    NULL==(idx2 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(intn)))) {
+	    HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, 0,
+			   "memory allocation failed");
+	}
+	for (i=0; i<dt1->u.compnd.nmembs; i++) idx1[i] = idx2[i] = i;
+	for (i=dt1->u.compnd.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
+	    for (j=0, swapped=FALSE; j<i; j++) {
+		if (HDstrcmp(dt1->u.compnd.memb[idx1[j]].name,
+			     dt1->u.compnd.memb[idx1[j+1]].name) > 0) {
+		    tmp = idx1[j];
+		    idx1[j] = idx1[j+1];
+		    idx1[j+1] = tmp;
+		    swapped = TRUE;
+		}
+	    }
+	}
+	for (i=dt2->u.compnd.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
+	    for (j=0, swapped=FALSE; j<i; j++) {
+		if (HDstrcmp(dt2->u.compnd.memb[idx2[j]].name,
+			     dt2->u.compnd.memb[idx2[j+1]].name) > 0) {
+		    tmp = idx2[j];
+		    idx2[j] = idx2[j+1];
+		    idx2[j+1] = tmp;
+		    swapped = TRUE;
+		}
+	    }
+	}
 
 #ifdef H5T_DEBUG
-        /* I don't quite trust the code above yet :-)  --RPM */
-        for (i=0; i<dt1->u.compnd.nmembs-1; i++) {
-            assert(HDstrcmp(dt1->u.compnd.memb[idx1[i]].name,
-                    dt1->u.compnd.memb[idx1[i + 1]].name));
-            assert(HDstrcmp(dt2->u.compnd.memb[idx2[i]].name,
-                    dt2->u.compnd.memb[idx2[i + 1]].name));
-        }
+	/* I don't quite trust the code above yet :-)  --RPM */
+	for (i=0; i<dt1->u.compnd.nmembs-1; i++) {
+	    assert(HDstrcmp(dt1->u.compnd.memb[idx1[i]].name,
+			    dt1->u.compnd.memb[idx1[i + 1]].name));
+	    assert(HDstrcmp(dt2->u.compnd.memb[idx2[i]].name,
+			    dt2->u.compnd.memb[idx2[i + 1]].name));
+	}
 #endif
 
-        /* Compare the members */
-        for (i=0; i<dt1->u.compnd.nmembs; i++) {
-            tmp = HDstrcmp(dt1->u.compnd.memb[idx1[i]].name,
-                   dt2->u.compnd.memb[idx2[i]].name);
-            if (tmp < 0) HGOTO_DONE(-1);
-            if (tmp > 0) HGOTO_DONE(1);
-
-            if (dt1->u.compnd.memb[idx1[i]].offset <
-            dt2->u.compnd.memb[idx2[i]].offset) HGOTO_DONE(-1);
-            if (dt1->u.compnd.memb[idx1[i]].offset >
-            dt2->u.compnd.memb[idx2[i]].offset) HGOTO_DONE(1);
-
-            if (dt1->u.compnd.memb[idx1[i]].size <
-            dt2->u.compnd.memb[idx2[i]].size) HGOTO_DONE(-1);
-            if (dt1->u.compnd.memb[idx1[i]].size >
-            dt2->u.compnd.memb[idx2[i]].size) HGOTO_DONE(1);
-
-            if (dt1->u.compnd.memb[idx1[i]].ndims <
-            dt2->u.compnd.memb[idx2[i]].ndims) HGOTO_DONE(-1);
-            if (dt1->u.compnd.memb[idx1[i]].ndims >
-            dt2->u.compnd.memb[idx2[i]].ndims) HGOTO_DONE(1);
-
-            for (j=0; j<dt1->u.compnd.memb[idx1[i]].ndims; j++) {
-            if (dt1->u.compnd.memb[idx1[i]].dim[j] <
-                dt2->u.compnd.memb[idx2[i]].dim[j]) HGOTO_DONE(-1);
-            if (dt1->u.compnd.memb[idx1[i]].dim[j] >
-                dt2->u.compnd.memb[idx2[i]].dim[j]) HGOTO_DONE(1);
-            }
+	/* Compare the members */
+	for (i=0; i<dt1->u.compnd.nmembs; i++) {
+	    tmp = HDstrcmp(dt1->u.compnd.memb[idx1[i]].name,
+			   dt2->u.compnd.memb[idx2[i]].name);
+	    if (tmp < 0) HGOTO_DONE(-1);
+	    if (tmp > 0) HGOTO_DONE(1);
+
+	    if (dt1->u.compnd.memb[idx1[i]].offset <
+		dt2->u.compnd.memb[idx2[i]].offset) HGOTO_DONE(-1);
+	    if (dt1->u.compnd.memb[idx1[i]].offset >
+		dt2->u.compnd.memb[idx2[i]].offset) HGOTO_DONE(1);
+
+	    if (dt1->u.compnd.memb[idx1[i]].size <
+		dt2->u.compnd.memb[idx2[i]].size) HGOTO_DONE(-1);
+	    if (dt1->u.compnd.memb[idx1[i]].size >
+		dt2->u.compnd.memb[idx2[i]].size) HGOTO_DONE(1);
+
+	    if (dt1->u.compnd.memb[idx1[i]].ndims <
+		dt2->u.compnd.memb[idx2[i]].ndims) HGOTO_DONE(-1);
+	    if (dt1->u.compnd.memb[idx1[i]].ndims >
+		dt2->u.compnd.memb[idx2[i]].ndims) HGOTO_DONE(1);
+
+	    for (j=0; j<dt1->u.compnd.memb[idx1[i]].ndims; j++) {
+		if (dt1->u.compnd.memb[idx1[i]].dim[j] <
+		    dt2->u.compnd.memb[idx2[i]].dim[j]) HGOTO_DONE(-1);
+		if (dt1->u.compnd.memb[idx1[i]].dim[j] >
+		    dt2->u.compnd.memb[idx2[i]].dim[j]) HGOTO_DONE(1);
+	    }
 
-            for (j=0; j<dt1->u.compnd.memb[idx1[i]].ndims; j++) {
-            if (dt1->u.compnd.memb[idx1[i]].perm[j] <
-                dt2->u.compnd.memb[idx2[i]].perm[j]) HGOTO_DONE(-1);
-            if (dt1->u.compnd.memb[idx1[i]].perm[j] >
-                dt2->u.compnd.memb[idx2[i]].perm[j]) HGOTO_DONE(1);
-            }
+	    for (j=0; j<dt1->u.compnd.memb[idx1[i]].ndims; j++) {
+		if (dt1->u.compnd.memb[idx1[i]].perm[j] <
+		    dt2->u.compnd.memb[idx2[i]].perm[j]) HGOTO_DONE(-1);
+		if (dt1->u.compnd.memb[idx1[i]].perm[j] >
+		    dt2->u.compnd.memb[idx2[i]].perm[j]) HGOTO_DONE(1);
+	    }
 
-            tmp = H5T_cmp(dt1->u.compnd.memb[idx1[i]].type,
-                  dt2->u.compnd.memb[idx2[i]].type);
-            if (tmp < 0) HGOTO_DONE(-1);
-            if (tmp > 0) HGOTO_DONE(1);
-        }
-        
+	    tmp = H5T_cmp(dt1->u.compnd.memb[idx1[i]].type,
+			  dt2->u.compnd.memb[idx2[i]].type);
+	    if (tmp < 0) HGOTO_DONE(-1);
+	    if (tmp > 0) HGOTO_DONE(1);
+	}
+	
     } else if (H5T_ENUM==dt1->type) {
-        /*
-         * Enumeration data types...
-         */
-        if (dt1->u.enumer.nmembs < dt2->u.enumer.nmembs) HGOTO_DONE(-1);
-        if (dt1->u.enumer.nmembs > dt2->u.enumer.nmembs) HGOTO_DONE(1);
+	/*
+	 * Enumeration data types...
+	 */
+	if (dt1->u.enumer.nmembs < dt2->u.enumer.nmembs) HGOTO_DONE(-1);
+	if (dt1->u.enumer.nmembs > dt2->u.enumer.nmembs) HGOTO_DONE(1);
 
-        /* Build an index for each type so the names are sorted */
-        if (NULL==(idx1 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(intn))) ||
-            NULL==(idx2 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(intn)))) {
-            HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, 0,
-                   "memory allocation failed");
-        }
-        for (i=0; i<dt1->u.enumer.nmembs; i++)
-            idx1[i] = idx2[i] = i;
-        for (i=dt1->u.enumer.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
-            for (j=0, swapped=FALSE; j<i; j++) {
-                if (HDstrcmp(dt1->u.enumer.name[idx1[j]],
-                         dt1->u.enumer.name[idx1[j+1]]) > 0) {
-                    tmp = idx1[j];
-                    idx1[j] = idx1[j+1];
-                    idx1[j+1] = tmp;
-                    swapped = TRUE;
-                }
-            }
-        }
-        for (i=dt2->u.enumer.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
-            for (j=0, swapped=FALSE; j<i; j++) {
-                if (HDstrcmp(dt2->u.enumer.name[idx2[j]],
-                         dt2->u.enumer.name[idx2[j+1]]) > 0) {
-                    tmp = idx2[j];
-                    idx2[j] = idx2[j+1];
-                    idx2[j+1] = tmp;
-                    swapped = TRUE;
-                }
-            }
-        }
+	/* Build an index for each type so the names are sorted */
+	if (NULL==(idx1 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(intn))) ||
+	    NULL==(idx2 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(intn)))) {
+	    HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, 0,
+			   "memory allocation failed");
+	}
+	for (i=0; i<dt1->u.enumer.nmembs; i++) idx1[i] = idx2[i] = i;
+	for (i=dt1->u.enumer.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
+	    for (j=0, swapped=FALSE; j<i; j++) {
+		if (HDstrcmp(dt1->u.enumer.name[idx1[j]],
+			     dt1->u.enumer.name[idx1[j+1]]) > 0) {
+		    tmp = idx1[j];
+		    idx1[j] = idx1[j+1];
+		    idx1[j+1] = tmp;
+		    swapped = TRUE;
+		}
+	    }
+	}
+	for (i=dt2->u.enumer.nmembs-1, swapped=TRUE; swapped && i>=0; --i) {
+	    for (j=0, swapped=FALSE; j<i; j++) {
+		if (HDstrcmp(dt2->u.enumer.name[idx2[j]],
+			     dt2->u.enumer.name[idx2[j+1]]) > 0) {
+		    tmp = idx2[j];
+		    idx2[j] = idx2[j+1];
+		    idx2[j+1] = tmp;
+		    swapped = TRUE;
+		}
+	    }
+	}
 
 #ifdef H5T_DEBUG
-        /* I don't quite trust the code above yet :-)  --RPM */
-        for (i=0; i<dt1->u.enumer.nmembs-1; i++) {
-            assert(HDstrcmp(dt1->u.enumer.name[idx1[i]],
-                    dt1->u.enumer.name[idx1[i+1]]));
-            assert(HDstrcmp(dt2->u.enumer.name[idx2[i]],
-                    dt2->u.enumer.name[idx2[i+1]]));
-        }
+	/* I don't quite trust the code above yet :-)  --RPM */
+	for (i=0; i<dt1->u.enumer.nmembs-1; i++) {
+	    assert(HDstrcmp(dt1->u.enumer.name[idx1[i]],
+			    dt1->u.enumer.name[idx1[i+1]]));
+	    assert(HDstrcmp(dt2->u.enumer.name[idx2[i]],
+			    dt2->u.enumer.name[idx2[i+1]]));
+	}
 #endif
 
-        /* Compare the members */
-        base_size = dt1->parent->size;
-        for (i=0; i<dt1->u.enumer.nmembs; i++) {
-            tmp = HDstrcmp(dt1->u.enumer.name[idx1[i]],
-                   dt2->u.enumer.name[idx2[i]]);
-            if (tmp<0) HGOTO_DONE(-1);
-            if (tmp>0) HGOTO_DONE(1);
-
-            tmp = HDmemcmp(dt1->u.enumer.value+idx1[i]*base_size,
-                   dt2->u.enumer.value+idx2[i]*base_size,
-                   base_size);
-            if (tmp<0) HGOTO_DONE(-1);
-            if (tmp>0) HGOTO_DONE(1);
-        }
-        
+	/* Compare the members */
+	base_size = dt1->parent->size;
+	for (i=0; i<dt1->u.enumer.nmembs; i++) {
+	    tmp = HDstrcmp(dt1->u.enumer.name[idx1[i]],
+			   dt2->u.enumer.name[idx2[i]]);
+	    if (tmp<0) HGOTO_DONE(-1);
+	    if (tmp>0) HGOTO_DONE(1);
+
+	    tmp = HDmemcmp(dt1->u.enumer.value+idx1[i]*base_size,
+			   dt2->u.enumer.value+idx2[i]*base_size,
+			   base_size);
+	    if (tmp<0) HGOTO_DONE(-1);
+	    if (tmp>0) HGOTO_DONE(1);
+	}
+	
     } else if (H5T_VLEN==dt1->type) {
         assert(dt1->u.vlen.type>H5T_VLEN_BADTYPE && dt1->u.vlen.type<H5T_VLEN_MAXTYPE);
         assert(dt2->u.vlen.type>H5T_VLEN_BADTYPE && dt2->u.vlen.type<H5T_VLEN_MAXTYPE);
@@ -6513,9 +6510,9 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
 	      H5T_conv_t func)
 {
     intn	lt, rt;			/*left and right edges		*/
-    intn	md;			    /*middle			*/
+    intn	md;			/*middle			*/
     intn	cmp;			/*comparison result		*/
-    H5T_path_t	*table=NULL;	/*path existing in the table	*/
+    H5T_path_t	*table=NULL;		/*path existing in the table	*/
     H5T_path_t	*path=NULL;		/*new path			*/
     H5T_path_t	*ret_value=NULL;	/*return value			*/
     hid_t	src_id=-1, dst_id=-1;	/*src and dst type identifiers	*/
@@ -6529,29 +6526,30 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * Make sure the first entry in the table is the no-op conversion path.
      */
     if (0==H5T_g.npaths) {
-        if (NULL==(H5T_g.path=H5MM_malloc(128*sizeof(H5T_path_t*)))) {
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                "memory allocation failed for type conversion path table");
-        }
-        H5T_g.apaths = 128;
-        if (NULL==(H5T_g.path[0]=H5MM_calloc(sizeof(H5T_path_t)))) {
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                "memory allocation failed for no-op conversion path");
-        }
-        HDstrcpy(H5T_g.path[0]->name, "no-op");
-        H5T_g.path[0]->func = H5T_conv_noop;
-        H5T_g.path[0]->cdata.command = H5T_CONV_INIT;
-        if (H5T_conv_noop(FAIL, FAIL, &(H5T_g.path[0]->cdata), 0, 0,
-                  NULL, NULL, H5P_DEFAULT)<0) {
+	if (NULL==(H5T_g.path=H5MM_malloc(128*sizeof(H5T_path_t*)))) {
+	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+			"memory allocation failed for type conversion path "
+			"table");
+	}
+	H5T_g.apaths = 128;
+	if (NULL==(H5T_g.path[0]=H5MM_calloc(sizeof(H5T_path_t)))) {
+	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+			"memory allocation failed for no-op conversion path");
+	}
+	HDstrcpy(H5T_g.path[0]->name, "no-op");
+	H5T_g.path[0]->func = H5T_conv_noop;
+	H5T_g.path[0]->cdata.command = H5T_CONV_INIT;
+	if (H5T_conv_noop(FAIL, FAIL, &(H5T_g.path[0]->cdata), 0, 0,
+			  NULL, NULL, H5P_DEFAULT)<0) {
 #ifdef H5T_DEBUG
-            if (H5DEBUG(T)) {
-                fprintf(H5DEBUG(T), "H5T: unable to initialize no-op "
-                "conversion function (ignored)\n");
-            }
+	    if (H5DEBUG(T)) {
+		fprintf(H5DEBUG(T), "H5T: unable to initialize no-op "
+			"conversion function (ignored)\n");
+	    }
 #endif
-            H5E_clear(); /*ignore the error*/
-        }
-        H5T_g.npaths = 1;
+	    H5E_clear(); /*ignore the error*/
+	}
+	H5T_g.npaths = 1;
     }
 
     /*
@@ -6564,28 +6562,27 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * are set
      */
     if (src->force_conv==FALSE && dst->force_conv==FALSE && 0==H5T_cmp(src, dst)) {
-        table = H5T_g.path[0];
-        cmp = 0;
-        md = 0;
+	table = H5T_g.path[0];
+	cmp = 0;
+	md = 0;
     } else {
-        lt = md = 1;
-        rt = H5T_g.npaths;
-        cmp = -1;
-        
-        while (cmp && lt<rt) {
-            md = (lt+rt) / 2;
-            assert(H5T_g.path[md]);
-            cmp = H5T_cmp(src, H5T_g.path[md]->src);
-            if (0==cmp)
-                cmp = H5T_cmp(dst, H5T_g.path[md]->dst);
-            if (cmp<0) {
-                rt = md;
-            } else if (cmp>0) {
-                lt = md+1;
-            } else {
-                table = H5T_g.path[md];
-            }
-        }
+	lt = md = 1;
+	rt = H5T_g.npaths;
+	cmp = -1;
+	
+	while (cmp && lt<rt) {
+	    md = (lt+rt) / 2;
+	    assert(H5T_g.path[md]);
+	    cmp = H5T_cmp(src, H5T_g.path[md]->src);
+	    if (0==cmp) cmp = H5T_cmp(dst, H5T_g.path[md]->dst);
+	    if (cmp<0) {
+		rt = md;
+	    } else if (cmp>0) {
+		lt = md+1;
+	    } else {
+		table = H5T_g.path[md];
+	    }
+	}
     }
     
     /*
@@ -6594,23 +6591,23 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * the path.
      */
     if (!table || func) {
-        if (NULL==(path=H5MM_calloc(sizeof(H5T_path_t)))) {
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                "memory allocation failed for type conversion path");
-        }
-        if (name && *name) {
-            strncpy(path->name, name, H5T_NAMELEN);
-            path->name[H5T_NAMELEN-1] = '\0';
-        } else {
-            strcpy(path->name, "NONAME");
-        }
-        if ((src && NULL==(path->src=H5T_copy(src, H5T_COPY_ALL))) ||
-                (dst && NULL==(path->dst=H5T_copy(dst, H5T_COPY_ALL)))) {
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
-                "unable to copy data type for conversion path");
-        }
+	if (NULL==(path=H5MM_calloc(sizeof(H5T_path_t)))) {
+	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
+			"memory allocation failed for type conversion path");
+	}
+	if (name && *name) {
+	    strncpy(path->name, name, H5T_NAMELEN);
+	    path->name[H5T_NAMELEN-1] = '\0';
+	} else {
+	    strcpy(path->name, "NONAME");
+	}
+	if ((src && NULL==(path->src=H5T_copy(src, H5T_COPY_ALL))) ||
+	    (dst && NULL==(path->dst=H5T_copy(dst, H5T_COPY_ALL)))) {
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+			"unable to copy data type for conversion path");
+	}
     } else {
-        path = table;
+	path = table;
     }
 
     /*
@@ -6618,30 +6615,31 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      * path then add it to the path and initialize its conversion data.
      */
     if (func) {
-        assert(path!=table);
-        assert(NULL==path->func);
-        if (path->src && (src_id=H5I_register(H5I_DATATYPE,
-                              H5T_copy(path->src, H5T_COPY_ALL)))<0) {
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
-                "unable to register source conversion type for query");
-        }
-        if (path->dst && (dst_id=H5I_register(H5I_DATATYPE,
-                              H5T_copy(path->dst, H5T_COPY_ALL)))<0) {
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
-                "unable to register destination conversion type for query");
-        }
-        path->cdata.command = H5T_CONV_INIT;
-        if ((func)(src_id, dst_id, &(path->cdata), 0, 0, NULL, NULL, H5P_DEFAULT)<0) {
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
-                "unable to initialize conversion function");
-        }
-        if (src_id>=0)
-            H5I_dec_ref(src_id);
-        if (dst_id>=0)
-            H5I_dec_ref(dst_id);
-        src_id = dst_id = -1;
-        path->func = func;
-        path->is_hard = TRUE;
+	assert(path!=table);
+	assert(NULL==path->func);
+	if (path->src && (src_id=H5I_register(H5I_DATATYPE,
+					      H5T_copy(path->src,
+						       H5T_COPY_ALL)))<0) {
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+			"unable to register source conversion type for query");
+	}
+	if (path->dst && (dst_id=H5I_register(H5I_DATATYPE,
+					      H5T_copy(path->dst,
+						       H5T_COPY_ALL)))<0) {
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+			"unable to register destination conversion type for "
+			"query");
+	}
+	path->cdata.command = H5T_CONV_INIT;
+	if ((func)(src_id, dst_id, &(path->cdata), 0, 0, NULL, NULL, H5P_DEFAULT)<0) {
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+			"unable to initialize conversion function");
+	}
+	if (src_id>=0) H5I_dec_ref(src_id);
+	if (dst_id>=0) H5I_dec_ref(dst_id);
+	src_id = dst_id = -1;
+	path->func = func;
+	path->is_hard = TRUE;
     }
     
     /*
@@ -6652,91 +6650,86 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
      */
     assert(path->func || (src && dst));
     for (i=H5T_g.nsoft-1; i>=0 && !path->func; --i) {
-        if (src->type!=H5T_g.soft[i].src || dst->type!=H5T_g.soft[i].dst)
-            continue;
-        if ((src_id=H5I_register(H5I_DATATYPE,
-                     H5T_copy(path->src, H5T_COPY_ALL)))<0 ||
-            (dst_id=H5I_register(H5I_DATATYPE,
-                     H5T_copy(path->dst, H5T_COPY_ALL)))<0) {
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
-                "unable to register conversion types for query");
-        }
-        path->cdata.command = H5T_CONV_INIT;
-        if ((H5T_g.soft[i].func) (src_id, dst_id, &(path->cdata),
-                           0, 0, NULL, NULL, H5P_DEFAULT)<0) {
-            HDmemset (&(path->cdata), 0, sizeof(H5T_cdata_t));
-            H5E_clear(); /*ignore the error*/
-        } else {
-            HDstrcpy (path->name, H5T_g.soft[i].name);
-            path->func = H5T_g.soft[i].func;
-            path->is_hard = FALSE;
-        }
-        H5I_dec_ref(src_id);
-        H5I_dec_ref(dst_id);
-        src_id = dst_id = -1;
+	if (src->type!=H5T_g.soft[i].src ||
+	    dst->type!=H5T_g.soft[i].dst) {
+	    continue;
+	}
+	if ((src_id=H5I_register(H5I_DATATYPE,
+				 H5T_copy(path->src, H5T_COPY_ALL)))<0 ||
+	    (dst_id=H5I_register(H5I_DATATYPE,
+				 H5T_copy(path->dst, H5T_COPY_ALL)))<0) {
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL,
+			"unable to register conversion types for query");
+	}
+	path->cdata.command = H5T_CONV_INIT;
+	if ((H5T_g.soft[i].func) (src_id, dst_id, &(path->cdata),
+				       0, 0, NULL, NULL, H5P_DEFAULT)<0) {
+	    HDmemset (&(path->cdata), 0, sizeof(H5T_cdata_t));
+	    H5E_clear(); /*ignore the error*/
+	} else {
+	    HDstrcpy (path->name, H5T_g.soft[i].name);
+	    path->func = H5T_g.soft[i].func;
+	    path->is_hard = FALSE;
+	}
+	H5I_dec_ref(src_id);
+	H5I_dec_ref(dst_id);
+	src_id = dst_id = -1;
     }
     if (!path->func) {
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
 		    "no appropriate function for conversion path");
     }
 
     /* Replace an existing table entry or add a new entry */
     if (table && path!=table) {
-        assert(table==H5T_g.path[md]);
-        H5T_print_stats(table, &nprint/*in,out*/);
-        table->cdata.command = H5T_CONV_FREE;
-        if ((table->func)(FAIL, FAIL, &(table->cdata), 0, 0, NULL, NULL, H5P_DEFAULT)<0) {
+	assert(table==H5T_g.path[md]);
+	H5T_print_stats(table, &nprint/*in,out*/);
+	table->cdata.command = H5T_CONV_FREE;
+	if ((table->func)(FAIL, FAIL, &(table->cdata), 0, 0, NULL, NULL, H5P_DEFAULT)<0) {
 #ifdef H5T_DEBUG
-            if (H5DEBUG(T)) {
-                fprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx free "
-                "failed for %s (ignored)\n",
-                (unsigned long)(path->func), path->name);
-            }
+	    if (H5DEBUG(T)) {
+		fprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx free "
+			"failed for %s (ignored)\n",
+			(unsigned long)(path->func), path->name);
+	    }
 #endif
-            H5E_clear(); /*ignore the failure*/
-        }
-        if (table->src)
-            H5T_close(table->src);
-        if (table->dst)
-            H5T_close(table->dst);
-        H5MM_xfree(table);
-        table = path;
-        H5T_g.path[md] = path;
+	    H5E_clear(); /*ignore the failure*/
+	}
+	if (table->src) H5T_close(table->src);
+	if (table->dst) H5T_close(table->dst);
+	H5MM_xfree(table);
+	table = path;
+	H5T_g.path[md] = path;
     } else if (path!=table) {
-        assert(cmp);
+	assert(cmp);
         if (H5T_g.npaths >= H5T_g.apaths) {
             size_t na = MAX(128, 2 * H5T_g.apaths);
             H5T_path_t **x = H5MM_realloc (H5T_g.path,
 					   na*sizeof(H5T_path_t*));
             if (!x) {
-                HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,
+		HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,
 			     "memory allocation failed");
             }
             H5T_g.apaths = (intn)na;
             H5T_g.path = x;
         }
-        if (cmp>0)
-            md++;
+        if (cmp>0) md++;
         HDmemmove(H5T_g.path+md+1, H5T_g.path+md,
 		  (H5T_g.npaths-md) * sizeof(H5T_path_t*));
         H5T_g.npaths++;
-        H5T_g.path[md] = path;
-        table = path;
+	H5T_g.path[md] = path;
+	table = path;
     }
     ret_value = path;
 
-done:
+ done:
     if (!ret_value && path && path!=table) {
-        if (path->src)
-            H5T_close(path->src);
-        if (path->dst)
-            H5T_close(path->dst);
-        H5MM_xfree(path);
+	if (path->src) H5T_close(path->src);
+	if (path->dst) H5T_close(path->dst);
+	H5MM_xfree(path);
     }
-    if (src_id>=0)
-        H5I_dec_ref(src_id);
-    if (dst_id>=0)
-        H5I_dec_ref(dst_id);
+    if (src_id>=0) H5I_dec_ref(src_id);
+    if (dst_id>=0) H5I_dec_ref(dst_id);
     
     FUNC_LEAVE(ret_value);
 }
@@ -6782,20 +6775,19 @@ H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts,
     FUNC_ENTER(H5T_convert, FAIL);
 
 #ifdef H5T_DEBUG
-    if (H5DEBUG(T))
-        H5_timer_begin(&timer);
+    if (H5DEBUG(T)) H5_timer_begin(&timer);
 #endif
     tpath->cdata.command = H5T_CONV_CONV;
     if ((tpath->func)(src_id, dst_id, &(tpath->cdata), nelmts, stride, buf,
 		      bkg, dset_xfer_plist)<0) {
-        HRETURN_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL,
+	HRETURN_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL,
 		      "data type conversion failed");
     }
 #ifdef H5T_DEBUG
     if (H5DEBUG(T)) {
-        H5_timer_end(&(tpath->stats.timer), &timer);
-        tpath->stats.ncalls++;
-        tpath->stats.nelmts += nelmts;
+	H5_timer_end(&(tpath->stats.timer), &timer);
+	tpath->stats.ncalls++;
+	tpath->stats.nelmts += nelmts;
     }
 #endif
 
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index cf1c7d1..6ec11df 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -348,8 +348,8 @@ static intn interface_initialize_g = 0;
             if (d_mv) HDmemcpy(dst, &aligned, dt_size);			      \
 									      \
 	    /* Advance pointers */					      \
-	    src = (char *)src + direction * s_stride;				      \
-	    dst = (char *)dst + direction * d_stride;				      \
+	    src = (char *)src + direction * s_stride;			      \
+	    dst = (char *)dst + direction * d_stride;			      \
         }								      \
         break;								      \
 									      \
@@ -446,7 +446,8 @@ H5T_conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	       size_t stride, void *_buf, void UNUSED *background, hid_t UNUSED dset_xfer_plist)
+	       size_t stride, void *_buf, void UNUSED *background,
+	       hid_t UNUSED dset_xfer_plist)
 {
     uint8_t	*buf = (uint8_t*)_buf;
     uint8_t	tmp;
@@ -552,7 +553,8 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	     size_t stride, void *_buf, void UNUSED *background, hid_t UNUSED dset_xfer_plist)
+	     size_t stride, void *_buf, void UNUSED *background,
+	     hid_t UNUSED dset_xfer_plist)
 {
     uint8_t	*buf = (uint8_t*)_buf;
     H5T_t	*src=NULL, *dst=NULL;	/*source and dest data types	*/
@@ -666,10 +668,10 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 	    }
 
 	    /*
-             * Copy the significant part of the value. If the source is larger
-             * than the destination then invoke the overflow function or copy
-             * as many bits as possible. Zero extra bits in the destination.
-             */
+	     * Copy the significant part of the value. If the source is larger
+	     * than the destination then invoke the overflow function or copy
+	     * as many bits as possible. Zero extra bits in the destination.
+	     */
 	    if (src->u.atomic.prec>dst->u.atomic.prec) {
 		if (!H5T_overflow_g ||
 		    (H5T_overflow_g)(src_id, dst_id, s, d)<0) {
@@ -685,8 +687,8 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 	    }
 
 	    /*
-             * Fill the destination padding areas.
-             */
+	     * Fill the destination padding areas.
+	     */
 	    switch (dst->u.atomic.lsb_pad) {
 	    case H5T_PAD_ZERO:
 		H5T_bit_set(d, 0, dst->u.atomic.offset, FALSE);
@@ -967,165 +969,168 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     FUNC_ENTER (H5T_conv_struct, FAIL);
 
     switch (cdata->command) {
-        case H5T_CONV_INIT:
-            /*
-             * First, determine if this conversion function applies to the
-             * conversion path SRC_ID-->DST_ID.  If not, return failure;
-             * otherwise initialize the `priv' field of `cdata' with information
-             * that remains (almost) constant for this conversion path.
-             */
-            if (H5I_DATATYPE != H5I_get_type(src_id) ||
-                    NULL == (src = H5I_object(src_id)) ||
-                    H5I_DATATYPE != H5I_get_type(dst_id) ||
-                    NULL == (dst = H5I_object(dst_id))) {
-                HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
-            }
-            assert (H5T_COMPOUND==src->type);
-            assert (H5T_COMPOUND==dst->type);
+    case H5T_CONV_INIT:
+	/*
+	 * First, determine if this conversion function applies to the
+	 * conversion path SRC_ID-->DST_ID.  If not, return failure;
+	 * otherwise initialize the `priv' field of `cdata' with information
+	 * that remains (almost) constant for this conversion path.
+	 */
+	if (H5I_DATATYPE != H5I_get_type(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5I_DATATYPE != H5I_get_type(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
+	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+	}
+	assert (H5T_COMPOUND==src->type);
+	assert (H5T_COMPOUND==dst->type);
 
-            if (H5T_conv_struct_init (src, dst, cdata)<0) {
-                HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                       "unable to initialize conversion data");
-            }
-            break;
+	if (H5T_conv_struct_init (src, dst, cdata)<0) {
+	    HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			   "unable to initialize conversion data");
+	}
+	break;
 
-        case H5T_CONV_FREE:
-            /*
-             * Free the private conversion data.
-             */
-            H5MM_xfree(priv->src2dst);
-            H5MM_xfree(priv->src_memb_id);
-            H5MM_xfree(priv->dst_memb_id);
-            H5MM_xfree(priv->memb_path);
-            H5MM_xfree(priv->memb_nelmts);
-            cdata->priv = priv = H5MM_xfree (priv);
-            break;
+    case H5T_CONV_FREE:
+	/*
+	 * Free the private conversion data.
+	 */
+	H5MM_xfree(priv->src2dst);
+	H5MM_xfree(priv->src_memb_id);
+	H5MM_xfree(priv->dst_memb_id);
+	H5MM_xfree(priv->memb_path);
+	H5MM_xfree(priv->memb_nelmts);
+	cdata->priv = priv = H5MM_xfree (priv);
+	break;
 
-        case H5T_CONV_CONV:
-            /*
-             * Conversion.
-             */
-            if (H5I_DATATYPE != H5I_get_type(src_id) ||
-                    NULL == (src = H5I_object(src_id)) ||
-                    H5I_DATATYPE != H5I_get_type(dst_id) ||
-                    NULL == (dst = H5I_object(dst_id))) {
-                HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
-            }
-            assert (priv);
-            assert (bkg && cdata->need_bkg>=H5T_BKG_TEMP);
+    case H5T_CONV_CONV:
+	/*
+	 * Conversion.
+	 */
+	if (H5I_DATATYPE != H5I_get_type(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5I_DATATYPE != H5I_get_type(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
+	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+	}
+	assert (priv);
+	assert (bkg && cdata->need_bkg>=H5T_BKG_TEMP);
 
-            if (cdata->recalc && H5T_conv_struct_init (src, dst, cdata)<0) {
-                HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                       "unable to initialize conversion data");
-            }
+	if (cdata->recalc && H5T_conv_struct_init (src, dst, cdata)<0) {
+	    HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			   "unable to initialize conversion data");
+	}
 
-            /*
-             * Insure that members are sorted.
-             */
-            H5T_sort_value(src, NULL);
-            H5T_sort_value(dst, NULL);
-            src2dst = priv->src2dst;
+	/*
+	 * Insure that members are sorted.
+	 */
+	H5T_sort_value(src, NULL);
+	H5T_sort_value(dst, NULL);
+	src2dst = priv->src2dst;
 
-            /*
-             * Direction of conversion.
-             */
-            if (stride) {
-                src_delta = dst_delta = stride;
-            } else if (dst->size <= src->size) {
-                src_delta = src->size;
-                dst_delta = dst->size;
-            } else {
-                src_delta = -(src->size);
-                dst_delta = -(dst->size);
-                buf += (nelmts-1) * src->size;
-                bkg += (nelmts-1) * dst->size;
-            }
+	/*
+	 * Direction of conversion.
+	 */
+	if (stride) {
+	    src_delta = dst_delta = stride;
+	} else if (dst->size <= src->size) {
+	    src_delta = src->size;
+	    dst_delta = dst->size;
+	} else {
+	    src_delta = -(src->size);
+	    dst_delta = -(dst->size);
+	    buf += (nelmts-1) * src->size;
+	    bkg += (nelmts-1) * dst->size;
+	}
 
-            for (elmtno=0; elmtno<nelmts; elmtno++) {
-                /*
-                 * For each source member which will be present in the
-                 * destination, convert the member to the destination type unless
-                 * it is larger than the source type.  Then move the member to the
-                 * left-most unoccupied position in the buffer.  This makes the
-                 * data point as small as possible with all the free space on the
-                 * right side.
-                 */
-                for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
-                    if (src2dst[i]<0)
-                        continue;
-                    src_memb = src->u.compnd.memb + i;
-                    dst_memb = dst->u.compnd.memb + src2dst[i];
-
-                    if (dst_memb->size <= src_memb->size) {
-                        if (H5T_convert(priv->memb_path[i],
-                                priv->src_memb_id[i],
-                                priv->dst_memb_id[src2dst[i]],
-                                priv->memb_nelmts[i],
-                                0, /*no striding*/
-                                buf + src_memb->offset,
-                                bkg + dst_memb->offset,dset_xfer_plist)<0) {
-                            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                                  "unable to convert compound data type member");
-                        }
-                        HDmemmove (buf+offset, buf+src_memb->offset,
+	for (elmtno=0; elmtno<nelmts; elmtno++) {
+	    /*
+	     * For each source member which will be present in the
+	     * destination, convert the member to the destination type unless
+	     * it is larger than the source type.  Then move the member to the
+	     * left-most unoccupied position in the buffer.  This makes the
+	     * data point as small as possible with all the free space on the
+	     * right side.
+	     */
+	    for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
+		if (src2dst[i]<0)
+		    continue;
+		src_memb = src->u.compnd.memb + i;
+		dst_memb = dst->u.compnd.memb + src2dst[i];
+
+		if (dst_memb->size <= src_memb->size) {
+		    if (H5T_convert(priv->memb_path[i],
+				    priv->src_memb_id[i],
+				    priv->dst_memb_id[src2dst[i]],
+				    priv->memb_nelmts[i],
+				    0, /*no striding*/
+				    buf+src_memb->offset,
+				    bkg+dst_memb->offset,dset_xfer_plist)<0) {
+			HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+				      "unable to convert compound data type "
+				      "member");
+		    }
+		    HDmemmove (buf+offset, buf+src_memb->offset,
                                dst_memb->size);
-                        offset += dst_memb->size;
-                    } else {
-                        HDmemmove (buf+offset, buf+src_memb->offset,
+		    offset += dst_memb->size;
+		} else {
+		    HDmemmove (buf+offset, buf+src_memb->offset,
                                src_memb->size);
-                        offset += src_memb->size;
-                    }
-                }
+		    offset += src_memb->size;
+		}
+	    }
 
-                /*
-                 * For each source member which will be present in the
-                 * destination, convert the member to the destination type if it
-                 * is larger than the source type (that is, has not been converted
-                 * yet).  Then copy the member to the destination offset in the
-                 * background buffer.
-                 */
-                for (i=src->u.compnd.nmembs-1; i>=0; --i) {
-                    if (src2dst[i]<0)
-                        continue;
-                    src_memb = src->u.compnd.memb + i;
-                    dst_memb = dst->u.compnd.memb + src2dst[i];
-
-                    if (dst_memb->size > src_memb->size) {
-                        offset -= src_memb->size;
-                        if (H5T_convert(priv->memb_path[i],
-                                priv->src_memb_id[i],
-                                priv->dst_memb_id[src2dst[i]],
-                                priv->memb_nelmts[i],
-                                0, /*no striding*/
-                                buf+offset, bkg+dst_memb->offset,dset_xfer_plist)<0) {
-                            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                                  "unable to convert compound data type member");
-                        }
-                    } else {
-                        offset -= dst_memb->size;
-                    }
-                    HDmemmove (bkg+dst_memb->offset, buf+offset, dst_memb->size);
-                }
-                assert (0==offset);
+	    /*
+	     * For each source member which will be present in the
+	     * destination, convert the member to the destination type if it
+	     * is larger than the source type (that is, has not been converted
+	     * yet).  Then copy the member to the destination offset in the
+	     * background buffer.
+	     */
+	    for (i=src->u.compnd.nmembs-1; i>=0; --i) {
+		if (src2dst[i]<0)
+		    continue;
+		src_memb = src->u.compnd.memb + i;
+		dst_memb = dst->u.compnd.memb + src2dst[i];
+
+		if (dst_memb->size > src_memb->size) {
+		    offset -= src_memb->size;
+		    if (H5T_convert(priv->memb_path[i],
+				    priv->src_memb_id[i],
+				    priv->dst_memb_id[src2dst[i]],
+				    priv->memb_nelmts[i],
+				    0, /*no striding*/
+				    buf+offset, bkg+dst_memb->offset,
+				    dset_xfer_plist)<0) {
+			HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+				      "unable to convert compound data type "
+				      "member");
+		    }
+		} else {
+		    offset -= dst_memb->size;
+		}
+		HDmemmove (bkg+dst_memb->offset, buf+offset, dst_memb->size);
+	    }
+	    assert (0==offset);
 
-                /*
-                 * Update buf and background.
-                 */
-                buf += src_delta;
-                bkg += dst_delta;
-            }
+	    /*
+	     * Update buf and background.
+	     */
+	    buf += src_delta;
+	    bkg += dst_delta;
+	}
 
-            /*
-             * Copy the background buffer back into the in-place conversion
-             * buffer.
-             */
-            HDmemcpy (_buf, _bkg, nelmts*dst->size);
-            break;
+	/*
+	 * Copy the background buffer back into the in-place conversion
+	 * buffer.
+	 */
+	HDmemcpy (_buf, _bkg, nelmts*dst->size);
+	break;
 
-        default:
-            /* Some other command we don't know about yet.*/
-            HRETURN_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                   "unknown conversion command");
+    default:
+	/* Some other command we don't know about yet.*/
+	HRETURN_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+		       "unknown conversion command");
     }
     
     FUNC_LEAVE (SUCCEED);
@@ -1179,7 +1184,8 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *_buf, void *_bkg, hid_t dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *_buf, void *_bkg,
+		    hid_t dset_xfer_plist)
 {
     uint8_t	*buf = (uint8_t *)_buf;	/*cast for pointer arithmetic	*/
     uint8_t	*bkg = (uint8_t *)_bkg;	/*background pointer arithmetic	*/
@@ -1200,214 +1206,214 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
     FUNC_ENTER (H5T_conv_struct_opt, FAIL);
 
     switch (cdata->command) {
-        case H5T_CONV_INIT:
-            /*
-             * First, determine if this conversion function applies to the
-             * conversion path SRC_ID-->DST_ID.  If not, return failure;
-             * otherwise initialize the `priv' field of `cdata' with information
-             * that remains (almost) constant for this conversion path.
-             */
-            if (H5I_DATATYPE != H5I_get_type(src_id) ||
-                    NULL == (src = H5I_object(src_id)) ||
-                    H5I_DATATYPE != H5I_get_type(dst_id) ||
-                    NULL == (dst = H5I_object(dst_id))) {
-                HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
-            }
-            assert (H5T_COMPOUND==src->type);
-            assert (H5T_COMPOUND==dst->type);
+    case H5T_CONV_INIT:
+	/*
+	 * First, determine if this conversion function applies to the
+	 * conversion path SRC_ID-->DST_ID.  If not, return failure;
+	 * otherwise initialize the `priv' field of `cdata' with information
+	 * that remains (almost) constant for this conversion path.
+	 */
+	if (H5I_DATATYPE != H5I_get_type(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5I_DATATYPE != H5I_get_type(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
+	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+	}
+	assert (H5T_COMPOUND==src->type);
+	assert (H5T_COMPOUND==dst->type);
 
-            /* Initialize data which is relatively constant */
-            if (H5T_conv_struct_init (src, dst, cdata)<0) {
-                HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                       "unable to initialize conversion data");
-            }
-            priv = (H5T_conv_struct_t *)(cdata->priv);
-            src2dst = priv->src2dst;
+	/* Initialize data which is relatively constant */
+	if (H5T_conv_struct_init (src, dst, cdata)<0) {
+	    HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			   "unable to initialize conversion data");
+	}
+	priv = (H5T_conv_struct_t *)(cdata->priv);
+	src2dst = priv->src2dst;
             
-            /*
-             * If the destination type is not larger than the source type then
-             * this conversion function is guaranteed to work (provided all
-             * members can be converted also). Otherwise the determination is
-             * quite a bit more complicated. Essentially we have to make sure
-             * that there is always room in the source buffer to do the
-             * conversion of a member in place. This is basically the same pair
-             * of loops as in the actual conversion except it checks that there
-             * is room for each conversion instead of actually doing anything.
-             */
-            if (dst->size > src->size) {
-                for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
-                    if (src2dst[i]<0)
-                        continue;
-                    src_memb = src->u.compnd.memb + i;
-                    dst_memb = dst->u.compnd.memb + src2dst[i];
-                    src_memb_size = src_memb->size / priv->memb_nelmts[i];
-                    dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
-                    for (j=0; j<(intn)(priv->memb_nelmts[i]); j++) {
-                        if (dst_memb_size > src_memb_size)
-                            offset += src_memb_size;
-                    }
-                }
-                for (i=src->u.compnd.nmembs-1; i>=0; --i) {
-                    if (src2dst[i]<0)
-                        continue;
-                    src_memb = src->u.compnd.memb + i;
-                    dst_memb = dst->u.compnd.memb + src2dst[i];
-                    src_memb_size = src_memb->size / priv->memb_nelmts[i];
-                    dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
-
-                    for (j=(intn)(priv->memb_nelmts[i]-1); j>=0; --j) {
-                        if (dst_memb_size > src_memb_size) {
-                            offset -= src_memb_size;
-                            if (dst_memb_size > src->size-offset) {
-                                H5MM_xfree(priv->src2dst);
-                                H5MM_xfree(priv->src_memb_id);
-                                H5MM_xfree(priv->dst_memb_id);
-                                H5MM_xfree(priv->memb_path);
-                                H5MM_xfree(priv->memb_nelmts);
-                                cdata->priv = priv = H5MM_xfree (priv);
-                                HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                                      "convertion is unsupported by this "
-                                      "function");
-                            }
-                        }
-                    }
-                }
-            }
-            break;
+	/*
+	 * If the destination type is not larger than the source type then
+	 * this conversion function is guaranteed to work (provided all
+	 * members can be converted also). Otherwise the determination is
+	 * quite a bit more complicated. Essentially we have to make sure
+	 * that there is always room in the source buffer to do the
+	 * conversion of a member in place. This is basically the same pair
+	 * of loops as in the actual conversion except it checks that there
+	 * is room for each conversion instead of actually doing anything.
+	 */
+	if (dst->size > src->size) {
+	    for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
+		if (src2dst[i]<0)
+		    continue;
+		src_memb = src->u.compnd.memb + i;
+		dst_memb = dst->u.compnd.memb + src2dst[i];
+		src_memb_size = src_memb->size / priv->memb_nelmts[i];
+		dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
+		for (j=0; j<(intn)(priv->memb_nelmts[i]); j++) {
+		    if (dst_memb_size > src_memb_size)
+			offset += src_memb_size;
+		}
+	    }
+	    for (i=src->u.compnd.nmembs-1; i>=0; --i) {
+		if (src2dst[i]<0)
+		    continue;
+		src_memb = src->u.compnd.memb + i;
+		dst_memb = dst->u.compnd.memb + src2dst[i];
+		src_memb_size = src_memb->size / priv->memb_nelmts[i];
+		dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
+
+		for (j=(intn)(priv->memb_nelmts[i]-1); j>=0; --j) {
+		    if (dst_memb_size > src_memb_size) {
+			offset -= src_memb_size;
+			if (dst_memb_size > src->size-offset) {
+			    H5MM_xfree(priv->src2dst);
+			    H5MM_xfree(priv->src_memb_id);
+			    H5MM_xfree(priv->dst_memb_id);
+			    H5MM_xfree(priv->memb_path);
+			    H5MM_xfree(priv->memb_nelmts);
+			    cdata->priv = priv = H5MM_xfree (priv);
+			    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+					  "convertion is unsupported by this "
+					  "function");
+			}
+		    }
+		}
+	    }
+	}
+	break;
 
-        case H5T_CONV_FREE:
-            /*
-             * Free the private conversion data.
-             */
-            priv = (H5T_conv_struct_t *)(cdata->priv);
-            H5MM_xfree(priv->src2dst);
-            H5MM_xfree(priv->src_memb_id);
-            H5MM_xfree(priv->dst_memb_id);
-            H5MM_xfree(priv->memb_path);
-            H5MM_xfree(priv->memb_nelmts);
-            cdata->priv = priv = H5MM_xfree (priv);
-            break;
+    case H5T_CONV_FREE:
+	/*
+	 * Free the private conversion data.
+	 */
+	priv = (H5T_conv_struct_t *)(cdata->priv);
+	H5MM_xfree(priv->src2dst);
+	H5MM_xfree(priv->src_memb_id);
+	H5MM_xfree(priv->dst_memb_id);
+	H5MM_xfree(priv->memb_path);
+	H5MM_xfree(priv->memb_nelmts);
+	cdata->priv = priv = H5MM_xfree (priv);
+	break;
 
-        case H5T_CONV_CONV:
-            /*
-             * Conversion.
-             */
-            if (H5I_DATATYPE != H5I_get_type(src_id) ||
-                    NULL == (src = H5I_object(src_id)) ||
-                    H5I_DATATYPE != H5I_get_type(dst_id) ||
-                    NULL == (dst = H5I_object(dst_id))) {
-                HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
-            }
+    case H5T_CONV_CONV:
+	/*
+	 * Conversion.
+	 */
+	if (H5I_DATATYPE != H5I_get_type(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5I_DATATYPE != H5I_get_type(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
+	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+	}
 
-            /* Update cached data if necessary */
-            if (cdata->recalc && H5T_conv_struct_init (src, dst, cdata)<0) {
-                HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                       "unable to initialize conversion data");
-            }
-            priv = (H5T_conv_struct_t *)(cdata->priv);
-            src2dst = priv->src2dst;
-            assert(priv);
-            assert(bkg && cdata->need_bkg>=H5T_BKG_TEMP);
+	/* Update cached data if necessary */
+	if (cdata->recalc && H5T_conv_struct_init (src, dst, cdata)<0) {
+	    HRETURN_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			   "unable to initialize conversion data");
+	}
+	priv = (H5T_conv_struct_t *)(cdata->priv);
+	src2dst = priv->src2dst;
+	assert(priv);
+	assert(bkg && cdata->need_bkg>=H5T_BKG_TEMP);
 
-            /*
-             * Insure that members are sorted.
-             */
-            H5T_sort_value(src, NULL);
-            H5T_sort_value(dst, NULL);
+	/*
+	 * Insure that members are sorted.
+	 */
+	H5T_sort_value(src, NULL);
+	H5T_sort_value(dst, NULL);
 
-            /*
-             * For each member where the destination is not larger than the
-             * source, stride through all the elements converting only that member
-             * in each element and then copying the element to its final
-             * destination in the bkg buffer. Otherwise move the element as far
-             * left as possible in the buffer.
-             */
-            for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
-                if (src2dst[i]<0)
-                    continue;
-                src_memb = src->u.compnd.memb + i;
-                dst_memb = dst->u.compnd.memb + src2dst[i];
-                src_memb_size = src_memb->size / priv->memb_nelmts[i];
-                dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
-
-                for (j=0; j<(intn)(priv->memb_nelmts[i]); j++) {
-                    if (dst_memb_size <= src_memb_size) {
-                        xbuf = buf + src_memb->offset + j*src_memb_size;
-                        xbkg = bkg + dst_memb->offset + j*dst_memb_size;
-                        if (H5T_convert(priv->memb_path[i],
-                                priv->src_memb_id[i],
-                                priv->dst_memb_id[src2dst[i]],
-                                nelmts,
-                                stride?stride:src->size,
-                                xbuf, xbkg,dset_xfer_plist)<0) {
-                            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                                  "unable to convert compound data "
-                                  "type member");
-                        }
-                        for (elmtno=0; elmtno<nelmts; elmtno++) {
-                            HDmemmove(xbkg, xbuf, dst_memb_size);
-                            xbuf += stride ? stride : src->size;
-                            xbkg += stride ? stride : dst->size;
-                        }
-                    } else {
-                        for (xbuf=buf, elmtno=0; elmtno<nelmts; elmtno++) {
-                            HDmemmove(xbuf+offset,
-                              xbuf+src_memb->offset+j*src_memb_size, src_memb_size);
-                            xbuf += stride ? stride : src->size;
-                        }
-                        offset += src_memb_size;
-                    }
-                }
-            }
+	/*
+	 * For each member where the destination is not larger than the
+	 * source, stride through all the elements converting only that member
+	 * in each element and then copying the element to its final
+	 * destination in the bkg buffer. Otherwise move the element as far
+	 * left as possible in the buffer.
+	 */
+	for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
+	    if (src2dst[i]<0)
+		continue;
+	    src_memb = src->u.compnd.memb + i;
+	    dst_memb = dst->u.compnd.memb + src2dst[i];
+	    src_memb_size = src_memb->size / priv->memb_nelmts[i];
+	    dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
+
+	    for (j=0; j<(intn)(priv->memb_nelmts[i]); j++) {
+		if (dst_memb_size <= src_memb_size) {
+		    xbuf = buf + src_memb->offset + j*src_memb_size;
+		    xbkg = bkg + dst_memb->offset + j*dst_memb_size;
+		    if (H5T_convert(priv->memb_path[i],
+				    priv->src_memb_id[i],
+				    priv->dst_memb_id[src2dst[i]],
+				    nelmts,
+				    stride?stride:src->size,
+				    xbuf, xbkg,dset_xfer_plist)<0) {
+			HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+				      "unable to convert compound data "
+				      "type member");
+		    }
+		    for (elmtno=0; elmtno<nelmts; elmtno++) {
+			HDmemmove(xbkg, xbuf, dst_memb_size);
+			xbuf += stride ? stride : src->size;
+			xbkg += stride ? stride : dst->size;
+		    }
+		} else {
+		    for (xbuf=buf, elmtno=0; elmtno<nelmts; elmtno++) {
+			HDmemmove(xbuf+offset,
+				  xbuf+src_memb->offset+j*src_memb_size, src_memb_size);
+			xbuf += stride ? stride : src->size;
+		    }
+		    offset += src_memb_size;
+		}
+	    }
+	}
 
-            /*
-             * Work from right to left, converting those members that weren't
-             * converted in the previous loop (those members where the destination
-             * is larger than the source) and them to their final position in the
-             * bkg buffer.
-             */
-            for (i=src->u.compnd.nmembs-1; i>=0; --i) {
-                if (src2dst[i]<0)
-                    continue;
-                src_memb = src->u.compnd.memb + i;
-                dst_memb = dst->u.compnd.memb + src2dst[i];
-                src_memb_size = src_memb->size / priv->memb_nelmts[i];
-                dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
-
-                for (j=(intn)(priv->memb_nelmts[i]-1); j>=0; --j) {
-                    if (dst_memb_size > src_memb_size) {
-                        offset -= src_memb_size;
-                        xbuf = buf + offset;
-                        xbkg = bkg + dst_memb->offset + j*dst_memb_size;
-                        if (H5T_convert(priv->memb_path[i],
-                                priv->src_memb_id[i],
-                                priv->dst_memb_id[src2dst[i]],
-                                nelmts, stride?stride:src->size,
-                                xbuf, xbkg, dset_xfer_plist)<0) {
-                            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
-                                  "unable to convert compound data type member");
-                        }
-                        for (elmtno=0; elmtno<nelmts; elmtno++) {
-                            HDmemmove(xbkg, xbuf, dst_memb_size);
-                            xbuf += stride ? stride : src->size;
-                            xbkg += stride ? stride : dst->size;
-                        }
-                    }
-                }
-            }
+	/*
+	 * Work from right to left, converting those members that weren't
+	 * converted in the previous loop (those members where the destination
+	 * is larger than the source) and them to their final position in the
+	 * bkg buffer.
+	 */
+	for (i=src->u.compnd.nmembs-1; i>=0; --i) {
+	    if (src2dst[i]<0)
+		continue;
+	    src_memb = src->u.compnd.memb + i;
+	    dst_memb = dst->u.compnd.memb + src2dst[i];
+	    src_memb_size = src_memb->size / priv->memb_nelmts[i];
+	    dst_memb_size = dst_memb->size / priv->memb_nelmts[i];
+
+	    for (j=(intn)(priv->memb_nelmts[i]-1); j>=0; --j) {
+		if (dst_memb_size > src_memb_size) {
+		    offset -= src_memb_size;
+		    xbuf = buf + offset;
+		    xbkg = bkg + dst_memb->offset + j*dst_memb_size;
+		    if (H5T_convert(priv->memb_path[i],
+				    priv->src_memb_id[i],
+				    priv->dst_memb_id[src2dst[i]],
+				    nelmts, stride?stride:src->size,
+				    xbuf, xbkg, dset_xfer_plist)<0) {
+			HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+				      "unable to convert compound data type member");
+		    }
+		    for (elmtno=0; elmtno<nelmts; elmtno++) {
+			HDmemmove(xbkg, xbuf, dst_memb_size);
+			xbuf += stride ? stride : src->size;
+			xbkg += stride ? stride : dst->size;
+		    }
+		}
+	    }
+	}
 
-            /* Move background into buffer */
-            for (xbuf=buf, xbkg=bkg, elmtno=0; elmtno<nelmts; elmtno++) {
-                HDmemmove(xbuf, xbkg, dst->size);
-                xbuf += stride ? stride : dst->size;
-                xbkg += stride ? stride : dst->size;
-            }
-            break;
+	/* Move background into buffer */
+	for (xbuf=buf, xbkg=bkg, elmtno=0; elmtno<nelmts; elmtno++) {
+	    HDmemmove(xbuf, xbkg, dst->size);
+	    xbuf += stride ? stride : dst->size;
+	    xbkg += stride ? stride : dst->size;
+	}
+	break;
 
-        default:
-            /* Some other command we don't know about yet.*/
-            HRETURN_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                   "unknown conversion command");
+    default:
+	/* Some other command we don't know about yet.*/
+	HRETURN_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+		       "unknown conversion command");
     }
     
     FUNC_LEAVE (SUCCEED);
@@ -1580,7 +1586,8 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
  */
 herr_t
 H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	      size_t stride, void *_buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+	      size_t stride, void *_buf, void UNUSED *bkg,
+	      hid_t UNUSED dset_xfer_plist)
 {
     uint8_t	*buf = (uint8_t*)_buf;	/*cast for pointer arithmetic	*/
     H5T_t	*src=NULL, *dst=NULL;	/*src and dst data types	*/
@@ -1759,7 +1766,8 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	      size_t stride, void *_buf, void UNUSED *_bkg, hid_t dset_xfer_plist)
+	      size_t stride, void *_buf, void UNUSED *_bkg,
+	      hid_t dset_xfer_plist)
 {
     const H5F_xfer_t	   *xfer_parms = NULL;
     H5T_path_t	*tpath;			/* Type conversion path		     */
@@ -1972,7 +1980,8 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	      size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+	      size_t stride, void *buf, void UNUSED *bkg,
+	      hid_t UNUSED dset_xfer_plist)
 {
     H5T_t	*src = NULL;		/*source data type		*/
     H5T_t	*dst = NULL;		/*destination data type		*/
@@ -2340,7 +2349,8 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	      size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+	      size_t stride, void *buf, void UNUSED *bkg,
+	      hid_t UNUSED dset_xfer_plist)
 {
     /* Traversal-related variables */
     H5T_t	*src_p;			/*source data type		*/
@@ -2749,7 +2759,8 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
-	      size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+	      size_t stride, void *buf, void UNUSED *bkg,
+	      hid_t UNUSED dset_xfer_plist)
 {
     H5T_t	*src=NULL;		/*source data type		*/
     H5T_t	*dst=NULL;		/*destination data type		*/
@@ -2984,7 +2995,8 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
  */
 herr_t
 H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf,
+		     void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_uchar, FAIL);
     H5T_CONV_su(SCHAR, UCHAR,
@@ -3011,7 +3023,8 @@ H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf,
+		     void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_schar, FAIL);
     H5T_CONV_us(UCHAR, SCHAR,
@@ -3039,7 +3052,8 @@ H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf,
+		     void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_short, FAIL);
     H5T_CONV_sS(SCHAR, SHORT,
@@ -3094,7 +3108,8 @@ H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf,
+		     void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_short, FAIL);
     H5T_CONV_uS(UCHAR, SHORT,
@@ -3150,7 +3165,8 @@ H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf,
+		   void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_int, FAIL);
     H5T_CONV_sS(SCHAR, INT,
@@ -3177,7 +3193,8 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_uint, FAIL);
     H5T_CONV_sU(SCHAR, UINT,
@@ -3204,7 +3221,8 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_int, FAIL);
     H5T_CONV_uS(UCHAR, INT,
@@ -3232,7 +3250,8 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_uint, FAIL);
     H5T_CONV_uU(UCHAR, UINT,
@@ -3259,7 +3278,8 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_long, FAIL);
     H5T_CONV_sS(SCHAR, LONG,
@@ -3286,7 +3306,8 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_ulong, FAIL);
     H5T_CONV_sU(SCHAR, ULONG,
@@ -3313,7 +3334,8 @@ H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_long, FAIL);
     H5T_CONV_uS(UCHAR, LONG,
@@ -3341,7 +3363,8 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_ulong, FAIL);
     H5T_CONV_uU(UCHAR, ULONG,
@@ -3368,7 +3391,8 @@ H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_schar_llong, FAIL);
     H5T_CONV_sS(SCHAR, LLONG,
@@ -3423,7 +3447,8 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uchar_llong, FAIL);
     H5T_CONV_uS(UCHAR, LLONG,
@@ -3479,7 +3504,8 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_schar, FAIL);
     H5T_CONV_Ss(SHORT, SCHAR,
@@ -3507,7 +3533,8 @@ H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_uchar, FAIL);
     H5T_CONV_Su(SHORT, UCHAR,
@@ -3650,7 +3677,8 @@ H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_int, FAIL);
     H5T_CONV_sS(SHORT, INT,
@@ -3677,7 +3705,8 @@ H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_uint, FAIL);
     H5T_CONV_sU(SHORT, UINT,
@@ -3704,7 +3733,8 @@ H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ushort_int, FAIL);
     H5T_CONV_uS(USHORT, INT,
@@ -3732,7 +3762,8 @@ H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ushort_uint, FAIL);
     H5T_CONV_uU(USHORT, UINT,
@@ -3759,7 +3790,8 @@ H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_long, FAIL);
     H5T_CONV_sS(SHORT, LONG,
@@ -3786,7 +3818,8 @@ H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_ulong, FAIL);
     H5T_CONV_sU(SHORT, ULONG,
@@ -3813,7 +3846,8 @@ H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ushort_long, FAIL);
     H5T_CONV_uS(USHORT, LONG,
@@ -3869,7 +3903,8 @@ H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_short_llong, FAIL);
     H5T_CONV_sS(SHORT, LLONG,
@@ -3981,7 +4016,8 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_schar, FAIL);
     H5T_CONV_Ss(INT, SCHAR,
@@ -4009,7 +4045,8 @@ H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_uchar, FAIL);
     H5T_CONV_Su(INT, UCHAR,
@@ -4037,7 +4074,8 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_schar, FAIL);
     H5T_CONV_Us(UINT, SCHAR,
@@ -4065,7 +4103,8 @@ H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_uchar, FAIL);
     H5T_CONV_Uu(UINT, UCHAR,
@@ -4093,7 +4132,8 @@ H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_short, FAIL);
     H5T_CONV_Ss(INT, SHORT,
@@ -4121,7 +4161,8 @@ H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_ushort, FAIL);
     H5T_CONV_Su(INT, USHORT,
@@ -4149,7 +4190,8 @@ H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_short, FAIL);
     H5T_CONV_Us(UINT, SHORT,
@@ -4177,7 +4219,8 @@ H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_ushort, FAIL);
     H5T_CONV_Uu(UINT, USHORT,
@@ -4205,7 +4248,8 @@ H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		  hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_uint, FAIL);
     H5T_CONV_su(INT, UINT,
@@ -4232,7 +4276,8 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		  hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_int, FAIL);
     H5T_CONV_us(UINT, INT,
@@ -4260,7 +4305,8 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		  hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_long, FAIL);
     H5T_CONV_sS(INT, LONG,
@@ -4287,7 +4333,8 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_ulong, FAIL);
     H5T_CONV_sU(INT, LONG,
@@ -4314,7 +4361,8 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_long, FAIL);
     H5T_CONV_uS(UINT, LONG,
@@ -4342,7 +4390,8 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_ulong, FAIL);
     H5T_CONV_uU(UINT, ULONG,
@@ -4369,7 +4418,8 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_llong, FAIL);
     H5T_CONV_sS(INT, LLONG,
@@ -4396,7 +4446,8 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_int_ullong, FAIL);
     H5T_CONV_sU(INT, ULLONG,
@@ -4423,7 +4474,8 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_llong, FAIL);
     H5T_CONV_uS(UINT, LLONG,
@@ -4451,7 +4503,8 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_uint_ullong, FAIL);
     H5T_CONV_uU(UINT, ULLONG,
@@ -4478,7 +4531,8 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_schar, FAIL);
     H5T_CONV_Ss(LONG, SCHAR,
@@ -4506,7 +4560,8 @@ H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_uchar, FAIL);
     H5T_CONV_Su(LONG, UCHAR,
@@ -4534,7 +4589,8 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ulong_schar, FAIL);
     H5T_CONV_Us(ULONG, SCHAR,
@@ -4562,7 +4618,8 @@ H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ulong_uchar, FAIL);
     H5T_CONV_Uu(ULONG, UCHAR,
@@ -4590,7 +4647,8 @@ H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_short, FAIL);
     H5T_CONV_Ss(LONG, SHORT,
@@ -4618,7 +4676,8 @@ H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_ushort, FAIL);
     H5T_CONV_Su(LONG, USHORT,
@@ -4646,7 +4705,8 @@ H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ulong_short, FAIL);
     H5T_CONV_Us(ULONG, SHORT,
@@ -4703,7 +4763,8 @@ H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		  size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		  hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_int, FAIL);
     H5T_CONV_Ss(LONG, INT,
@@ -4731,7 +4792,8 @@ H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_uint, FAIL);
     H5T_CONV_Su(LONG, UINT,
@@ -4759,7 +4821,8 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ulong_int, FAIL);
     H5T_CONV_Us(ULONG, INT,
@@ -4787,7 +4850,8 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ulong_uint, FAIL);
     H5T_CONV_Uu(ULONG, UINT,
@@ -4815,7 +4879,8 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_ulong, FAIL);
     H5T_CONV_su(LONG, ULONG,
@@ -4842,7 +4907,8 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ulong_long, FAIL);
     H5T_CONV_us(ULONG, LONG,
@@ -4870,7 +4936,8 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_llong, FAIL);
     H5T_CONV_sS(LONG, LLONG,
@@ -4897,7 +4964,8 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_ullong, FAIL);
     H5T_CONV_sU(LONG, ULLONG,
@@ -4924,7 +4992,8 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_long_llong, FAIL);
     H5T_CONV_uS(ULONG, LLONG,
@@ -4980,7 +5049,8 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_schar, FAIL);
     H5T_CONV_Ss(LLONG, SCHAR,
@@ -5008,7 +5078,8 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_uchar, FAIL);
     H5T_CONV_Su(LLONG, UCHAR,
@@ -5065,7 +5136,8 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		      hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ullong_uchar, FAIL);
     H5T_CONV_Uu(ULLONG, UCHAR,
@@ -5093,7 +5165,8 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_short, FAIL);
     H5T_CONV_Ss(LLONG, SHORT,
@@ -5208,7 +5281,8 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		   size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		   hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_int, FAIL);
     H5T_CONV_Ss(LLONG, INT,
@@ -5236,7 +5310,8 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_uint, FAIL);
     H5T_CONV_Su(LLONG, UINT,
@@ -5264,7 +5339,8 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ullong_int, FAIL);
     H5T_CONV_Us(ULLONG, INT,
@@ -5292,7 +5368,8 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ullong_uint, FAIL);
     H5T_CONV_Uu(ULLONG, UINT,
@@ -5320,7 +5397,8 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		    size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		    hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_long, FAIL);
     H5T_CONV_Ss(LLONG, LONG,
@@ -5348,7 +5426,8 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_llong_ulong, FAIL);
     H5T_CONV_Su(LLONG, ULONG,
@@ -5376,7 +5455,8 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  */
 herr_t
 H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist)
+		     size_t nelmts, size_t stride, void *buf, void UNUSED *bkg,
+		     hid_t UNUSED dset_xfer_plist)
 {
     FUNC_ENTER(H5T_conv_ullong_long, FAIL);
     H5T_CONV_Us(ULLONG, LONG,