[svn-r1010] Changes since 19981217

----------------------

./src/H5.c
./src/H5private.h
        Renamed `library_initialize_g' to `H5_libinit_g' to make it
        conform to our naming scheme.

./src/H5I.c
        Fixed a bug in H5I_dec_ref() that caused the return value to
        always be zero instead of the new reference count.

./src/H5.c
./src/H5Odtype.c
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5Tprivate.h
./src/H5Tpublic.h
        Added support for enumeration data types.

./src/H5RA.c
        Renamed H5T_insert() to H5T_struct_insert() and added
        H5T_enum_insert().

./src/H5RA.c
./src/H5Shyper.c
        Added casts to size_t for the third argument of memcpy() to
        shut up a warning message from insure++.

./src/H5T.c
        Changed "can't" to "unable to" in some error messages to be
        more consistent.

./src/H5detect.c
        If fork() or waitpid() are unavailable then we assume no
        alignment constraints. Hopefully this is the case only on NT
        and Intel CPU's don't have alignment constraints.

./src/H5public.h
        Include <limits.h> because the H5T_NATIVE_CHAR macro needs the
        definition for CHAR_MIN.

1 files changed, 633 insertions, 540 deletions

diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 84de73c..2a5d7f3 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -1,22 +1,22 @@
 /****************************************************************************
-* NCSA HDF                                                                 *
-* Software Development Group                                               *
-* National Center for Supercomputing Applications                          *
-* University of Illinois at Urbana-Champaign                               *
-* 605 E. Springfield, Champaign IL 61820                                   *
-*                                                                          *
-* For conditions of distribution and use, see the accompanying             *
-* hdf/COPYING file.                                                        *
-*                                                                          *
+* NCSA HDF								   *
+* Software Development Group						   *
+* National Center for Supercomputing Applications			   *
+* University of Illinois at Urbana-Champaign				   *
+* 605 E. Springfield, Champaign IL 61820				   *
+*									   *
+* For conditions of distribution and use, see the accompanying		   *
+* hdf/COPYING file.							   *
+*									   *
 ****************************************************************************/
 
 #ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
+static char		RcsId[] = "@(#)$Revision$";
 #endif
 
 /* $Id$ */
 
-#define H5T_PACKAGE             /*prevent warning from including H5Tpkg.h */
+#define H5T_PACKAGE		/*prevent warning from including H5Tpkg.h */
 
 #include <H5private.h>
 #include <H5Eprivate.h>
@@ -25,7 +25,7 @@ static char             RcsId[] = "@(#)$Revision$";
 #include <H5Oprivate.h>
 #include <H5Tpkg.h>
 
-#define PABLO_MASK      H5O_dtype_mask
+#define PABLO_MASK	H5O_dtype_mask
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_dtype_encode (H5F_t *f, uint8_t *p, const void *mesg);
@@ -42,34 +42,34 @@ static herr_t H5O_dtype_debug (H5F_t *f, const void *_mesg,
 
 /* This message derives from H5O */
 const H5O_class_t H5O_DTYPE[1] = {{
-    H5O_DTYPE_ID,		/* message id number            */
-    "data_type",		/* message name for debugging   */
-    sizeof(H5T_t),		/* native message size          */
-    H5O_dtype_decode,		/* decode message               */
-    H5O_dtype_encode,		/* encode message               */
-    H5O_dtype_copy,		/* copy the native value        */
-    H5O_dtype_size,		/* size of raw message          */
-    H5O_dtype_reset,		/* reset method                 */
+    H5O_DTYPE_ID,		/* message id number		*/
+    "data_type",		/* message name for debugging	*/
+    sizeof(H5T_t),		/* native message size		*/
+    H5O_dtype_decode,		/* decode message		*/
+    H5O_dtype_encode,		/* encode message		*/
+    H5O_dtype_copy,		/* copy the native value	*/
+    H5O_dtype_size,		/* size of raw message		*/
+    H5O_dtype_reset,		/* reset method			*/
     H5O_dtype_get_share,	/* get share method		*/
     H5O_dtype_set_share,	/* set share method		*/
-    H5O_dtype_debug,		/* debug the message            */
+    H5O_dtype_debug,		/* debug the message		*/
 }};
 
 #define H5O_DTYPE_VERSION	1
 
 /* Interface initialization */
 static intn		interface_initialize_g = 0;
-#define INTERFACE_INIT  NULL
+#define INTERFACE_INIT	NULL
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_dtype_decode_helper
+ * Function:	H5O_dtype_decode_helper
  *
- * Purpose:     Decodes a data type
+ * Purpose:	Decodes a data type
  *
- * Return:      Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:  Robb Matzke
- *              Monday, December  8, 1997
+ * Programmer:	Robb Matzke
+ *		Monday, December  8, 1997
  *
  * Modifications:
  *
@@ -78,8 +78,8 @@ static intn		interface_initialize_g = 0;
 static herr_t
 H5O_dtype_decode_helper(const uint8_t **pp, H5T_t *dt)
 {
-    uintn                   flags, perm_word, version;
-    intn                    i, j;
+    uintn		    flags, perm_word, version;
+    intn		    i, j;
 
     FUNC_ENTER(H5O_dtype_decode_helper, FAIL);
 
@@ -100,16 +100,16 @@ H5O_dtype_decode_helper(const uint8_t **pp, H5T_t *dt)
 
     switch (dt->type) {
     case H5T_INTEGER:
-        /*
-         * Integer types...
-         */
-        dt->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
-        dt->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-        dt->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-        dt->u.atomic.u.i.sign = (flags & 0x8) ? H5T_SGN_2 : H5T_SGN_NONE;
-        UINT16DECODE(*pp, dt->u.atomic.offset);
-        UINT16DECODE(*pp, dt->u.atomic.prec);
-        break;
+	/*
+	 * Integer types...
+	 */
+	dt->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
+	dt->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+	dt->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+	dt->u.atomic.u.i.sign = (flags & 0x8) ? H5T_SGN_2 : H5T_SGN_NONE;
+	UINT16DECODE(*pp, dt->u.atomic.offset);
+	UINT16DECODE(*pp, dt->u.atomic.prec);
+	break;
 
     case H5T_STRING:
 	/*
@@ -126,125 +126,159 @@ H5O_dtype_decode_helper(const uint8_t **pp, H5T_t *dt)
 	break;
 
     case H5T_FLOAT:
-        /*
-         * Floating-point types...
-         */
-        dt->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
-        dt->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-        dt->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-        dt->u.atomic.u.f.pad = (flags & 0x8) ? H5T_PAD_ONE : H5T_PAD_ZERO;
-        switch ((flags >> 4) & 0x03) {
-        case 0:
-            dt->u.atomic.u.f.norm = H5T_NORM_NONE;
-            break;
-        case 1:
-            dt->u.atomic.u.f.norm = H5T_NORM_MSBSET;
-            break;
-        case 2:
-            dt->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "unknown floating-point normalization");
-        }
-        dt->u.atomic.u.f.sign = (flags >> 8) & 0xff;
-        UINT16DECODE(*pp, dt->u.atomic.offset);
-        UINT16DECODE(*pp, dt->u.atomic.prec);
-        dt->u.atomic.u.f.epos = *(*pp)++;
-        dt->u.atomic.u.f.esize = *(*pp)++;
-        assert(dt->u.atomic.u.f.esize > 0);
-        dt->u.atomic.u.f.mpos = *(*pp)++;
-        dt->u.atomic.u.f.msize = *(*pp)++;
-        assert(dt->u.atomic.u.f.msize > 0);
-        UINT32DECODE(*pp, dt->u.atomic.u.f.ebias);
-        break;
+	/*
+	 * Floating-point types...
+	 */
+	dt->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
+	dt->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+	dt->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+	dt->u.atomic.u.f.pad = (flags & 0x8) ? H5T_PAD_ONE : H5T_PAD_ZERO;
+	switch ((flags >> 4) & 0x03) {
+	case 0:
+	    dt->u.atomic.u.f.norm = H5T_NORM_NONE;
+	    break;
+	case 1:
+	    dt->u.atomic.u.f.norm = H5T_NORM_MSBSET;
+	    break;
+	case 2:
+	    dt->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "unknown floating-point normalization");
+	}
+	dt->u.atomic.u.f.sign = (flags >> 8) & 0xff;
+	UINT16DECODE(*pp, dt->u.atomic.offset);
+	UINT16DECODE(*pp, dt->u.atomic.prec);
+	dt->u.atomic.u.f.epos = *(*pp)++;
+	dt->u.atomic.u.f.esize = *(*pp)++;
+	assert(dt->u.atomic.u.f.esize > 0);
+	dt->u.atomic.u.f.mpos = *(*pp)++;
+	dt->u.atomic.u.f.msize = *(*pp)++;
+	assert(dt->u.atomic.u.f.msize > 0);
+	UINT32DECODE(*pp, dt->u.atomic.u.f.ebias);
+	break;
 
     case H5T_COMPOUND:
-        /*
-         * Compound data types...
-         */
-        dt->u.compnd.nmembs = flags & 0xffff;
-        assert(dt->u.compnd.nmembs > 0);
-        dt->u.compnd.nalloc = dt->u.compnd.nmembs;
-        dt->u.compnd.memb = H5MM_calloc(dt->u.compnd.nalloc*
-					sizeof(H5T_member_t));
+	/*
+	 * Compound data types...
+	 */
+	dt->u.compnd.nmembs = flags & 0xffff;
+	assert(dt->u.compnd.nmembs > 0);
+	dt->u.compnd.nalloc = dt->u.compnd.nmembs;
+	dt->u.compnd.memb = H5MM_calloc(dt->u.compnd.nalloc*
+					sizeof(H5T_cmemb_t));
 	if (NULL==dt->u.compnd.memb) {
 	    HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
 			   "memory allocation failed");
 	}
-        for (i = 0; i < dt->u.compnd.nmembs; i++) {
-            dt->u.compnd.memb[i].name = H5MM_xstrdup((const char *)*pp);
+	for (i = 0; i < dt->u.compnd.nmembs; i++) {
+	    dt->u.compnd.memb[i].name = H5MM_xstrdup((const char *)*pp);
 	    /*multiple of 8 w/ null terminator */
-            *pp += ((HDstrlen((const char *)*pp) + 8) / 8) * 8;
-            UINT32DECODE(*pp, dt->u.compnd.memb[i].offset);
-            dt->u.compnd.memb[i].ndims = *(*pp)++;
-            assert(dt->u.compnd.memb[i].ndims <= 4);
-            *pp += 3;           /*reserved bytes */
+	    *pp += ((HDstrlen((const char *)*pp) + 8) / 8) * 8;
+	    UINT32DECODE(*pp, dt->u.compnd.memb[i].offset);
+	    dt->u.compnd.memb[i].ndims = *(*pp)++;
+	    assert(dt->u.compnd.memb[i].ndims <= 4);
+	    *pp += 3;		/*reserved bytes */
 
 	    /* Dimension permutation */
-            UINT32DECODE(*pp, perm_word);
-            dt->u.compnd.memb[i].perm[0] = (perm_word >> 0) & 0xff;
-            dt->u.compnd.memb[i].perm[1] = (perm_word >> 8) & 0xff;
-            dt->u.compnd.memb[i].perm[2] = (perm_word >> 16) & 0xff;
-            dt->u.compnd.memb[i].perm[3] = (perm_word >> 24) & 0xff;
+	    UINT32DECODE(*pp, perm_word);
+	    dt->u.compnd.memb[i].perm[0] = (perm_word >> 0) & 0xff;
+	    dt->u.compnd.memb[i].perm[1] = (perm_word >> 8) & 0xff;
+	    dt->u.compnd.memb[i].perm[2] = (perm_word >> 16) & 0xff;
+	    dt->u.compnd.memb[i].perm[3] = (perm_word >> 24) & 0xff;
 	    dt->u.compnd.memb[i].type = H5MM_calloc (sizeof(H5T_t));
 
 	    /* Reserved */
 	    *pp += 4;
 	    
 	    /* Dimension sizes */
-            for (j=0; j<4; j++) {
-                UINT32DECODE(*pp, dt->u.compnd.memb[i].dim[j]);
-            }
+	    for (j=0; j<4; j++) {
+		UINT32DECODE(*pp, dt->u.compnd.memb[i].dim[j]);
+	    }
 	    if (NULL==dt->u.compnd.memb[i].type) {
 		HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
 			       "memory allocation failed");
 	    }
 	    H5F_addr_undef (&(dt->u.compnd.memb[i].type->ent.header));
-            if (H5O_dtype_decode_helper(pp, dt->u.compnd.memb[i].type)<0) {
-                for (j=0; j<=i; j++) H5MM_xfree(dt->u.compnd.memb[j].name);
-                H5MM_xfree(dt->u.compnd.memb);
-                HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL,
-                              "can't decode member type");
-            }
+	    if (H5O_dtype_decode_helper(pp, dt->u.compnd.memb[i].type)<0) {
+		for (j=0; j<=i; j++) H5MM_xfree(dt->u.compnd.memb[j].name);
+		H5MM_xfree(dt->u.compnd.memb);
+		HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL,
+			      "unable to decode member type");
+	    }
 	    
 	    /* Total member size */
 	    dt->u.compnd.memb[i].size = dt->u.compnd.memb[i].type->size;
 	    for (j=0; j<dt->u.compnd.memb[i].ndims; j++) {
 		dt->u.compnd.memb[i].size *= dt->u.compnd.memb[i].dim[j];
 	    }
-        }
-        break;
+	}
+	break;
+
+    case H5T_ENUM:
+	/*
+	 * Enumeration data types...
+	 */
+	dt->u.enumer.nmembs = dt->u.enumer.nalloc = flags & 0xffff;
+	assert(dt->u.enumer.nmembs>=0);
+	if (NULL==(dt->parent=H5MM_calloc(sizeof(H5T_t)))) {
+	    HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+			  "memory allocation failed");
+	}
+	H5F_addr_undef(&(dt->parent->ent.header));
+	if (H5O_dtype_decode_helper(pp, dt->parent)<0) {
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL,
+			  "unable to decode parent data type");
+	}
+	if (NULL==(dt->u.enumer.name=H5MM_calloc(dt->u.enumer.nalloc *
+						 sizeof(char*))) ||
+	    NULL==(dt->u.enumer.value=H5MM_calloc(dt->u.enumer.nalloc *
+						  dt->parent->size))) {
+	    HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+			  "memory allocation failed");
+	}
+
+	/* Names, each a multiple of 8 with null termination */
+	for (i=0; i<dt->u.enumer.nmembs; i++) {
+	    dt->u.enumer.name[i] = H5MM_xstrdup((const char*)*pp);
+	    *pp += ((HDstrlen((const char*)*pp)+8)/8)*8;
+	}
+
+	/* Values */
+	HDmemcpy(dt->u.enumer.value, *pp,
+		 dt->u.enumer.nmembs * dt->parent->size);
+	break;
 
     case H5T_REFERENCE:
-        dt->u.atomic.order = H5T_ORDER_NONE;
-        dt->u.atomic.prec = 8 * dt->size;
-        dt->u.atomic.offset = 0;
-        dt->u.atomic.lsb_pad = H5T_PAD_ZERO;
-        dt->u.atomic.msb_pad = H5T_PAD_ZERO;
-        dt->u.atomic.u.r.rtype = flags & 0x0f;
-        break;
+	dt->u.atomic.order = H5T_ORDER_NONE;
+	dt->u.atomic.prec = 8 * dt->size;
+	dt->u.atomic.offset = 0;
+	dt->u.atomic.lsb_pad = H5T_PAD_ZERO;
+	dt->u.atomic.msb_pad = H5T_PAD_ZERO;
+	dt->u.atomic.u.r.rtype = flags & 0x0f;
+	break;
 
     default:
-        if (flags) {
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "class flags are non-zero");
-        }
-        break;
+	if (flags) {
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "class flags are non-zero");
+	}
+	break;
     }
 
     FUNC_LEAVE(SUCCEED);
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_dtype_encode_helper
+ * Function:	H5O_dtype_encode_helper
  *
- * Purpose:     Encodes a data type.
+ * Purpose:	Encodes a data type.
  *
- * Return:      Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:  Robb Matzke
- *              Monday, December  8, 1997
+ * Programmer:	Robb Matzke
+ *		Monday, December  8, 1997
  *
  * Modifications:
  *
@@ -253,10 +287,10 @@ H5O_dtype_decode_helper(const uint8_t **pp, H5T_t *dt)
 static herr_t
 H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
 {
-    uintn               flags = 0;
-    uintn               perm_word;
-    char                *hdr = (char *)*pp;
-    intn                i, j;
+    uintn		flags = 0;
+    uintn		perm_word;
+    char		*hdr = (char *)*pp;
+    intn		i, j;
     size_t		n, z;
 
     FUNC_ENTER(H5O_dtype_encode_helper, FAIL);
@@ -271,56 +305,56 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
 
     switch (dt->type) {
     case H5T_INTEGER:
-        /*
-         * Integer data types...
-         */
-        switch (dt->u.atomic.order) {
-        case H5T_ORDER_LE:
-            break;              /*nothing */
-        case H5T_ORDER_BE:
-            flags |= 0x01;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "byte order is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.lsb_pad) {
-        case H5T_PAD_ZERO:
-            break;              /*nothing */
-        case H5T_PAD_ONE:
-            flags |= 0x02;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "bit padding is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.msb_pad) {
-        case H5T_PAD_ZERO:
-            break;              /*nothing */
-        case H5T_PAD_ONE:
-            flags |= 0x04;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "bit padding is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.u.i.sign) {
-        case H5T_SGN_NONE:
-            break;              /*nothing */
-        case H5T_SGN_2:
-            flags |= 0x08;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "sign scheme is not supported in file format yet");
-        }
-
-        UINT16ENCODE(*pp, dt->u.atomic.offset);
-        UINT16ENCODE(*pp, dt->u.atomic.prec);
-        break;
+	/*
+	 * Integer data types...
+	 */
+	switch (dt->u.atomic.order) {
+	case H5T_ORDER_LE:
+	    break;		/*nothing */
+	case H5T_ORDER_BE:
+	    flags |= 0x01;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "byte order is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.lsb_pad) {
+	case H5T_PAD_ZERO:
+	    break;		/*nothing */
+	case H5T_PAD_ONE:
+	    flags |= 0x02;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "bit padding is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.msb_pad) {
+	case H5T_PAD_ZERO:
+	    break;		/*nothing */
+	case H5T_PAD_ONE:
+	    flags |= 0x04;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "bit padding is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.u.i.sign) {
+	case H5T_SGN_NONE:
+	    break;		/*nothing */
+	case H5T_SGN_2:
+	    flags |= 0x08;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "sign scheme is not supported in file format yet");
+	}
+
+	UINT16ENCODE(*pp, dt->u.atomic.offset);
+	UINT16ENCODE(*pp, dt->u.atomic.prec);
+	break;
 
     case H5T_STRING:
 	/*
@@ -337,138 +371,164 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
 	break;
 
     case H5T_FLOAT:
-        /*
-         * Floating-point types...
-         */
-        switch (dt->u.atomic.order) {
-        case H5T_ORDER_LE:
-            break;              /*nothing */
-        case H5T_ORDER_BE:
-            flags |= 0x01;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "byte order is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.lsb_pad) {
-        case H5T_PAD_ZERO:
-            break;              /*nothing */
-        case H5T_PAD_ONE:
-            flags |= 0x02;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "bit padding is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.msb_pad) {
-        case H5T_PAD_ZERO:
-            break;              /*nothing */
-        case H5T_PAD_ONE:
-            flags |= 0x04;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "bit padding is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.u.f.pad) {
-        case H5T_PAD_ZERO:
-            break;              /*nothing */
-        case H5T_PAD_ONE:
-            flags |= 0x08;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "bit padding is not supported in file format yet");
-        }
-
-        switch (dt->u.atomic.u.f.norm) {
-        case H5T_NORM_NONE:
-            break;              /*nothing */
-        case H5T_NORM_MSBSET:
-            flags |= 0x10;
-            break;
-        case H5T_NORM_IMPLIED:
-            flags |= 0x20;
-            break;
-        default:
-            HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-                          "normalization scheme is not supported in file "
-                          "format yet");
-        }
-
-        flags |= (dt->u.atomic.u.f.sign << 8) & 0xff00;
-        UINT16ENCODE(*pp, dt->u.atomic.offset);
-        UINT16ENCODE(*pp, dt->u.atomic.prec);
+	/*
+	 * Floating-point types...
+	 */
+	switch (dt->u.atomic.order) {
+	case H5T_ORDER_LE:
+	    break;		/*nothing */
+	case H5T_ORDER_BE:
+	    flags |= 0x01;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "byte order is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.lsb_pad) {
+	case H5T_PAD_ZERO:
+	    break;		/*nothing */
+	case H5T_PAD_ONE:
+	    flags |= 0x02;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "bit padding is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.msb_pad) {
+	case H5T_PAD_ZERO:
+	    break;		/*nothing */
+	case H5T_PAD_ONE:
+	    flags |= 0x04;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "bit padding is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.u.f.pad) {
+	case H5T_PAD_ZERO:
+	    break;		/*nothing */
+	case H5T_PAD_ONE:
+	    flags |= 0x08;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "bit padding is not supported in file format yet");
+	}
+
+	switch (dt->u.atomic.u.f.norm) {
+	case H5T_NORM_NONE:
+	    break;		/*nothing */
+	case H5T_NORM_MSBSET:
+	    flags |= 0x10;
+	    break;
+	case H5T_NORM_IMPLIED:
+	    flags |= 0x20;
+	    break;
+	default:
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
+			  "normalization scheme is not supported in file "
+			  "format yet");
+	}
+
+	flags |= (dt->u.atomic.u.f.sign << 8) & 0xff00;
+	UINT16ENCODE(*pp, dt->u.atomic.offset);
+	UINT16ENCODE(*pp, dt->u.atomic.prec);
 	assert (dt->u.atomic.u.f.epos<=255);
-        *(*pp)++ = (uint8_t)(dt->u.atomic.u.f.epos);
+	*(*pp)++ = (uint8_t)(dt->u.atomic.u.f.epos);
 	assert (dt->u.atomic.u.f.esize<=255);
-        *(*pp)++ = (uint8_t)(dt->u.atomic.u.f.esize);
+	*(*pp)++ = (uint8_t)(dt->u.atomic.u.f.esize);
 	assert (dt->u.atomic.u.f.mpos<=255);
-        *(*pp)++ = (uint8_t)(dt->u.atomic.u.f.mpos);
+	*(*pp)++ = (uint8_t)(dt->u.atomic.u.f.mpos);
 	assert (dt->u.atomic.u.f.msize<=255);
-        *(*pp)++ = (uint8_t)(dt->u.atomic.u.f.msize);
-        UINT32ENCODE(*pp, dt->u.atomic.u.f.ebias);
-        break;
+	*(*pp)++ = (uint8_t)(dt->u.atomic.u.f.msize);
+	UINT32ENCODE(*pp, dt->u.atomic.u.f.ebias);
+	break;
 
     case H5T_COMPOUND:
-        /*
-         * Compound data types...
-         */
-        flags = dt->u.compnd.nmembs & 0xffff;
-        for (i = 0; i < dt->u.compnd.nmembs; i++) {
+	/*
+	 * Compound data types...
+	 */
+	flags = dt->u.compnd.nmembs & 0xffff;
+	for (i=0; i<dt->u.compnd.nmembs; i++) {
 	    /* Name, multiple of eight bytes */
-	    HDstrcpy ((char*)(*pp), dt->u.compnd.memb[i].name);
-            n = HDstrlen(dt->u.compnd.memb[i].name);
+	    HDstrcpy((char*)(*pp), dt->u.compnd.memb[i].name);
+	    n = HDstrlen(dt->u.compnd.memb[i].name);
 	    for (z=n+1; z%8; z++) (*pp)[z] = '\0';
 	    *pp += z;
 
 	    /* Member offset */
-            UINT32ENCODE(*pp, dt->u.compnd.memb[i].offset);
+	    UINT32ENCODE(*pp, dt->u.compnd.memb[i].offset);
 
 	    /* Dimensionality */
-            *(*pp)++ = dt->u.compnd.memb[i].ndims;
-            assert(dt->u.compnd.memb[i].ndims <= 4);
+	    *(*pp)++ = dt->u.compnd.memb[i].ndims;
+	    assert(dt->u.compnd.memb[i].ndims <= 4);
 
 	    /* Reserved */
-            *(*pp)++ = '\0';
-            *(*pp)++ = '\0';
-            *(*pp)++ = '\0';
+	    *(*pp)++ = '\0';
+	    *(*pp)++ = '\0';
+	    *(*pp)++ = '\0';
 
 	    /* Dimension permutation */
-            for (j = 0, perm_word = 0; j < dt->u.compnd.memb[i].ndims; j++) {
-                perm_word |= dt->u.compnd.memb[i].perm[j] << (8 * j);
-            }
-            UINT32ENCODE(*pp, perm_word);
+	    for (j = 0, perm_word = 0; j < dt->u.compnd.memb[i].ndims; j++) {
+		perm_word |= dt->u.compnd.memb[i].perm[j] << (8 * j);
+	    }
+	    UINT32ENCODE(*pp, perm_word);
 
 	    /* Reserved */
 	    UINT32ENCODE(*pp, 0);
 
 	    /* Dimensions */
-            for (j=0; j<dt->u.compnd.memb[i].ndims; j++) {
-                UINT32ENCODE(*pp, dt->u.compnd.memb[i].dim[j]);
-            }
+	    for (j=0; j<dt->u.compnd.memb[i].ndims; j++) {
+		UINT32ENCODE(*pp, dt->u.compnd.memb[i].dim[j]);
+	    }
 	    for (/*void*/; j<4; j++) {
 		UINT32ENCODE(*pp, 0);
 	    }
 
 	    /* Subtype */
-            if (H5O_dtype_encode_helper(pp, dt->u.compnd.memb[i].type)<0) {
-                HRETURN_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL,
-                              "can't encode member type");
-            }
-        }
-        break;
+	    if (H5O_dtype_encode_helper(pp, dt->u.compnd.memb[i].type)<0) {
+		HRETURN_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL,
+			      "unable to encode member type");
+	    }
+	}
+	break;
+
+    case H5T_ENUM:
+	/*
+	 * Enumeration data types...
+	 */
+	flags = dt->u.enumer.nmembs & 0xffff;
 
+	/* Parent type */
+	if (H5O_dtype_encode_helper(pp, dt->parent)<0) {
+	    HRETURN_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL,
+			  "unable to encode parent data type");
+	}
+	
+	/* Names, each a multiple of eight bytes */
+	for (i=0; i<dt->u.enumer.nmembs; i++) {
+	    HDstrcpy((char*)(*pp), dt->u.enumer.name[i]);
+	    n = HDstrlen(dt->u.enumer.name[i]);
+	    for (z=n+1; z%8; z++) (*pp)[z] = '\0';
+	    *pp += z;
+	}
+
+	/* Values */
+	HDmemcpy(*pp, dt->u.enumer.value,
+		 dt->u.enumer.nmembs * dt->parent->size);
+	*pp += dt->u.enumer.nmembs * dt->parent->size;
+	break;
+	
     case H5T_REFERENCE:
-        flags |= (dt->u.atomic.u.r.rtype & 0x0f);
-        break;
-        
+	flags |= (dt->u.atomic.u.r.rtype & 0x0f);
+	break;
+	
     default:
-        /*nothing */
-        break;
+	/*nothing */
+	break;
     }
 
     *hdr++ = ((uintn)(dt->type) & 0x0f) | (H5O_DTYPE_VERSION<<4);
@@ -484,16 +544,16 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
     H5O_dtype_decode
  PURPOSE
     Decode a datatype message and return a pointer to a memory struct
-        with the decoded information
+	with the decoded information
  USAGE
     void *H5O_dtype_decode(f, raw_size, p)
-        H5F_t *f;               IN: pointer to the HDF5 file struct
-        size_t raw_size;        IN: size of the raw information buffer
-        const uint8 *p;         IN: the raw information buffer
+	H5F_t *f;		IN: pointer to the HDF5 file struct
+	size_t raw_size;	IN: size of the raw information buffer
+	const uint8 *p;		IN: the raw information buffer
  RETURNS
     Pointer to the new message in native order on success, NULL on failure
  DESCRIPTION
-        This function decodes the "raw" disk form of a simple datatype message
+	This function decodes the "raw" disk form of a simple datatype message
     into a struct in memory native format.  The struct is allocated within this
     function using malloc() and is returned to the caller.
 --------------------------------------------------------------------------*/
@@ -501,7 +561,7 @@ static void *
 H5O_dtype_decode(H5F_t __unused__ *f, const uint8_t *p,
 		 H5O_shared_t __unused__ *sh)
 {
-    H5T_t                  *dt = NULL;
+    H5T_t		   *dt = NULL;
 
     FUNC_ENTER(H5O_dtype_decode, NULL);
 
@@ -515,9 +575,9 @@ H5O_dtype_decode(H5F_t __unused__ *f, const uint8_t *p,
     H5F_addr_undef (&(dt->ent.header));
 
     if (H5O_dtype_decode_helper(&p, dt) < 0) {
-        H5MM_xfree(dt);
-        HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, NULL,
-                      "can't decode type");
+	H5MM_xfree(dt);
+	HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, NULL,
+		      "can't decode type");
     }
     FUNC_LEAVE(dt);
 }
@@ -529,20 +589,20 @@ H5O_dtype_decode(H5F_t __unused__ *f, const uint8_t *p,
     Encode a simple datatype message 
  USAGE
     herr_t H5O_dtype_encode(f, raw_size, p, mesg)
-        H5F_t *f;         IN: pointer to the HDF5 file struct
-        size_t raw_size;        IN: size of the raw information buffer
-        const uint8 *p;         IN: the raw information buffer
-        const void *mesg;       IN: Pointer to the simple datatype struct
+	H5F_t *f;	  IN: pointer to the HDF5 file struct
+	size_t raw_size;	IN: size of the raw information buffer
+	const uint8 *p;		IN: the raw information buffer
+	const void *mesg;	IN: Pointer to the simple datatype struct
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-        This function encodes the native memory form of the simple datatype
+	This function encodes the native memory form of the simple datatype
     message in the "raw" disk form.
 --------------------------------------------------------------------------*/
 static herr_t
 H5O_dtype_encode(H5F_t __unused__ *f, uint8_t *p, const void *mesg)
 {
-    const H5T_t            *dt = (const H5T_t *) mesg;
+    const H5T_t		   *dt = (const H5T_t *) mesg;
 
     FUNC_ENTER(H5O_dtype_encode, FAIL);
 
@@ -553,8 +613,8 @@ H5O_dtype_encode(H5F_t __unused__ *f, uint8_t *p, const void *mesg)
 
     /* encode */
     if (H5O_dtype_encode_helper(&p, dt) < 0) {
-        HRETURN_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL,
-                      "can't encode type");
+	HRETURN_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL,
+		      "can't encode type");
     }
     FUNC_LEAVE(SUCCEED);
 }
@@ -566,21 +626,21 @@ H5O_dtype_encode(H5F_t __unused__ *f, uint8_t *p, const void *mesg)
     Copies a message from MESG to DEST, allocating DEST if necessary.
  USAGE
     void *H5O_dtype_copy(mesg, dest)
-        const void *mesg;       IN: Pointer to the source simple datatype
-                                    struct 
-        const void *dest;       IN: Pointer to the destination simple
-                                    datatype struct 
+	const void *mesg;	IN: Pointer to the source simple datatype
+				    struct 
+	const void *dest;	IN: Pointer to the destination simple
+				    datatype struct 
  RETURNS
     Pointer to DEST on success, NULL on failure
  DESCRIPTION
-        This function copies a native (memory) simple datatype message,
+	This function copies a native (memory) simple datatype message,
     allocating the destination structure if necessary.
 --------------------------------------------------------------------------*/
 static void *
 H5O_dtype_copy(const void *_src, void *_dst)
 {
-    const H5T_t            *src = (const H5T_t *) _src;
-    H5T_t                  *dst = NULL;
+    const H5T_t		   *src = (const H5T_t *) _src;
+    H5T_t		   *dst = NULL;
 
     FUNC_ENTER(H5O_dtype_copy, NULL);
 
@@ -589,13 +649,13 @@ H5O_dtype_copy(const void *_src, void *_dst)
 
     /* copy */
     if (NULL == (dst = H5T_copy(src, H5T_COPY_ALL))) {
-        HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "can't copy type");
+	HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "can't copy type");
     }
     /* was result already allocated? */
     if (_dst) {
-        *((H5T_t *) _dst) = *dst;
-        H5MM_xfree(dst);
-        dst = (H5T_t *) _dst;
+	*((H5T_t *) _dst) = *dst;
+	H5MM_xfree(dst);
+	dst = (H5T_t *) _dst;
     }
     FUNC_LEAVE((void *) dst);
 }
@@ -607,21 +667,21 @@ H5O_dtype_copy(const void *_src, void *_dst)
     Return the raw message size in bytes
  USAGE
     void *H5O_dtype_size(f, mesg)
-        H5F_t *f;         IN: pointer to the HDF5 file struct
-        const void *mesg;     IN: Pointer to the source simple datatype struct
+	H5F_t *f;	  IN: pointer to the HDF5 file struct
+	const void *mesg;     IN: Pointer to the source simple datatype struct
  RETURNS
     Size of message on success, 0 on failure
  DESCRIPTION
-        This function returns the size of the raw simple datatype message on
+	This function returns the size of the raw simple datatype message on
     success.  (Not counting the message type or size fields, only the data
     portion of the message).  It doesn't take into account alignment.
 --------------------------------------------------------------------------*/
 static size_t
 H5O_dtype_size(H5F_t *f, const void *mesg)
 {
-    intn                    i;
-    size_t                  ret_value = 8;
-    const H5T_t            *dt = (const H5T_t *) mesg;
+    intn		    i;
+    size_t		    ret_value = 8;
+    const H5T_t		   *dt = (const H5T_t *) mesg;
 
     FUNC_ENTER(H5O_dtype_size, 0);
 
@@ -629,44 +689,52 @@ H5O_dtype_size(H5F_t *f, const void *mesg)
 
     switch (dt->type) {
     case H5T_INTEGER:
-        ret_value += 4;
-        break;
+	ret_value += 4;
+	break;
 
     case H5T_FLOAT:
-        ret_value += 12;
-        break;
+	ret_value += 12;
+	break;
 
     case H5T_COMPOUND:
-        for (i = 0; i < dt->u.compnd.nmembs; i++) {
-            ret_value += ((HDstrlen(dt->u.compnd.memb[i].name) + 8) / 8) * 8;
+	for (i=0; i<dt->u.compnd.nmembs; i++) {
+	    ret_value += ((HDstrlen(dt->u.compnd.memb[i].name) + 8) / 8) * 8;
 	    ret_value += 4 +		/*member offset*/
 			 1 +		/*dimensionality*/
 			 3 +		/*reserved*/
 			 4 +		/*permutation*/
 			 4 +		/*reserved*/
 			 16;		/*dimensions*/
-            ret_value += H5O_dtype_size(f, dt->u.compnd.memb[i].type);
-        }
-        break;
+	    ret_value += H5O_dtype_size(f, dt->u.compnd.memb[i].type);
+	}
+	break;
+
+    case H5T_ENUM:
+	ret_value += H5O_dtype_size(f, dt->parent);
+	for (i=0; i<dt->u.enumer.nmembs; i++) {
+	    ret_value += ((HDstrlen(dt->u.enumer.name[i])+8)/8)*8;
+	}
+	ret_value += dt->u.enumer.nmembs * dt->parent->size;
+	break;
 
     default:
-        /*no properties */
-        break;
+	/*no properties */
+	break;
     }
 
     FUNC_LEAVE(ret_value);
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_dtype_reset
+ * Function:	H5O_dtype_reset
  *
- * Purpose:     Frees resources within a data type message, but doesn't free
- *              the message itself.
+ * Purpose:	Frees resources within a data type message, but doesn't free
+ *		the message itself.
  *
- * Return:      Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:  Robb Matzke
- *              Tuesday, December  9, 1997
+ * Programmer:	Robb Matzke
+ *		Tuesday, December  9, 1997
  *
  * Modifications:
  *
@@ -675,19 +743,19 @@ H5O_dtype_size(H5F_t *f, const void *mesg)
 static herr_t
 H5O_dtype_reset(void *_mesg)
 {
-    H5T_t                  *dt = (H5T_t *) _mesg;
-    H5T_t                  *tmp = NULL;
+    H5T_t		   *dt = (H5T_t *) _mesg;
+    H5T_t		   *tmp = NULL;
 
     FUNC_ENTER(H5O_dtype_reset, FAIL);
 
     if (dt) {
-        if (NULL==(tmp = H5MM_malloc(sizeof(H5T_t)))) {
+	if (NULL==(tmp = H5MM_malloc(sizeof(H5T_t)))) {
 	    HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
 			   "memory allocation failed");
 	}
-        *tmp = *dt;
-        H5T_close(tmp);
-        HDmemset(dt, 0, sizeof(H5T_t));
+	*tmp = *dt;
+	H5T_close(tmp);
+	HDmemset(dt, 0, sizeof(H5T_t));
     }
     FUNC_LEAVE(SUCCEED);
 }
@@ -702,7 +770,7 @@ H5O_dtype_reset(void *_mesg)
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Robb Matzke
- *              Monday, June  1, 1998
+ *		Monday, June  1, 1998
  *
  * Modifications:
  *
@@ -739,7 +807,7 @@ H5O_dtype_get_share (H5F_t __unused__ *f, const void *_mesg,
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Robb Matzke
- *              Thursday, June  4, 1998
+ *		Thursday, June	4, 1998
  *
  * Modifications:
  *
@@ -769,26 +837,28 @@ H5O_dtype_set_share (H5F_t __unused__ *f, void *_mesg/*in,out*/,
     Prints debugging information for a data type message
  USAGE
     void *H5O_dtype_debug(f, mesg, stream, indent, fwidth)
-        H5F_t *f;               IN: pointer to the HDF5 file struct
-        const void *mesg;       IN: Pointer to the source simple datatype
-                                    struct
-        FILE *stream;           IN: Pointer to the stream for output data
-        intn indent;            IN: Amount to indent information by
-        intn fwidth;            IN: Field width (?)
+	H5F_t *f;		IN: pointer to the HDF5 file struct
+	const void *mesg;	IN: Pointer to the source simple datatype
+				    struct
+	FILE *stream;		IN: Pointer to the stream for output data
+	intn indent;		IN: Amount to indent information by
+	intn fwidth;		IN: Field width (?)
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
-        This function prints debugging output to the stream passed as a 
+	This function prints debugging output to the stream passed as a 
     parameter.
 --------------------------------------------------------------------------*/
 static herr_t
-H5O_dtype_debug(H5F_t *f, const void *mesg, FILE * stream,
-                intn indent, intn fwidth)
+H5O_dtype_debug(H5F_t *f, const void *mesg, FILE *stream,
+		intn indent, intn fwidth)
 {
-    const H5T_t            *dt = (const H5T_t *) mesg;
-    const char             *s;
-    char                    buf[256];
-    intn                    i, j;
+    const H5T_t		*dt = (const H5T_t*)mesg;
+    const char		*s;
+    char		buf[256];
+    intn		i, j;
+    size_t		k;
+    
 
     FUNC_ENTER(H5O_dtype_debug, FAIL);
 
@@ -801,213 +871,236 @@ H5O_dtype_debug(H5F_t *f, const void *mesg, FILE * stream,
 
     switch (dt->type) {
     case H5T_INTEGER:
-        s = "integer";
-        break;
+	s = "integer";
+	break;
     case H5T_FLOAT:
-        s = "floating-point";
-        break;
+	s = "floating-point";
+	break;
     case H5T_TIME:
-        s = "date and time";
-        break;
+	s = "date and time";
+	break;
     case H5T_STRING:
-        s = "text string";
-        break;
+	s = "text string";
+	break;
     case H5T_BITFIELD:
-        s = "bit field";
-        break;
+	s = "bit field";
+	break;
     case H5T_OPAQUE:
-        s = "opaque";
-        break;
+	s = "opaque";
+	break;
     case H5T_COMPOUND:
-        s = "compound";
-        break;
+	s = "compound";
+	break;
+    case H5T_ENUM:
+	s = "enum";
+	break;
     default:
-        sprintf(buf, "H5T_CLASS_%d", (int) (dt->type));
-        s = buf;
-        break;
+	sprintf(buf, "H5T_CLASS_%d", (int) (dt->type));
+	s = buf;
+	break;
     }
     fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-            "Type class:",
-            s);
+	    "Type class:",
+	    s);
 
     fprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth,
-            "Size:",
-            (unsigned long) (dt->size), 1 == dt->size ? "" : "s");
+	    "Size:",
+	    (unsigned long)(dt->size), 1==dt->size?"":"s");
 
     if (H5T_COMPOUND == dt->type) {
-        fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
-                "Number of members:",
-                dt->u.compnd.nmembs);
-        for (i = 0; i < dt->u.compnd.nmembs; i++) {
-            sprintf(buf, "Member %d:", i);
-            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    buf,
-                    dt->u.compnd.memb[i].name);
-            fprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth-3),
-                    "Byte offset:",
-                    (unsigned long) (dt->u.compnd.memb[i].offset));
-            fprintf(stream, "%*s%-*s %d%s\n", indent + 3, "", MAX(0, fwidth-3),
-                    "Dimensionality:",
-                    dt->u.compnd.memb[i].ndims,
-                    0 == dt->u.compnd.memb[i].ndims ? " (scalar)" : "");
-            if (dt->u.compnd.memb[i].ndims > 0) {
-                fprintf(stream, "%*s%-*s {", indent + 3, "", MAX(0, fwidth-3),
-                        "Size:");
-                for (j = 0; j < dt->u.compnd.memb[i].ndims; j++) {
-                    fprintf(stream, "%s%lu", j ? ", " : "",
-                            (unsigned long) (dt->u.compnd.memb[i].dim[j]));
-                }
-                fprintf(stream, "}\n");
-                fprintf(stream, "%*s%-*s {", indent + 3, "", MAX(0, fwidth-3),
-                        "Permutation:");
-                for (j = 0; j < dt->u.compnd.memb[i].ndims; j++) {
-                    fprintf(stream, "%s%lu", j ? ", " : "",
-                            (unsigned long) (dt->u.compnd.memb[i].perm[j]));
-                }
-                fprintf(stream, "}\n");
-            }
-            H5O_dtype_debug(f, dt->u.compnd.memb[i].type, stream,
-                            indent + 3, MAX(0, fwidth - 3));
-        }
+	fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
+		"Number of members:",
+		dt->u.compnd.nmembs);
+	for (i=0; i<dt->u.compnd.nmembs; i++) {
+	    sprintf(buf, "Member %d:", i);
+	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		    buf,
+		    dt->u.compnd.memb[i].name);
+	    fprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX(0, fwidth-3),
+		    "Byte offset:",
+		    (unsigned long) (dt->u.compnd.memb[i].offset));
+	    fprintf(stream, "%*s%-*s %d%s\n", indent+3, "", MAX(0, fwidth-3),
+		    "Dimensionality:",
+		    dt->u.compnd.memb[i].ndims,
+		    0==dt->u.compnd.memb[i].ndims?" (scalar)":"");
+	    if (dt->u.compnd.memb[i].ndims>0) {
+		fprintf(stream, "%*s%-*s {", indent+3, "", MAX(0, fwidth-3),
+			"Size:");
+		for (j=0; j<dt->u.compnd.memb[i].ndims; j++) {
+		    fprintf(stream, "%s%lu", j?", ":"",
+			    (unsigned long)(dt->u.compnd.memb[i].dim[j]));
+		}
+		fprintf(stream, "}\n");
+		fprintf(stream, "%*s%-*s {", indent+3, "", MAX(0, fwidth-3),
+			"Permutation:");
+		for (j=0; j<dt->u.compnd.memb[i].ndims; j++) {
+		    fprintf(stream, "%s%lu", j?", ":"",
+			    (unsigned long)(dt->u.compnd.memb[i].perm[j]));
+		}
+		fprintf(stream, "}\n");
+	    }
+	    H5O_dtype_debug(f, dt->u.compnd.memb[i].type, stream,
+			    indent+3, MAX(0, fwidth - 3));
+	}
+    } else if (H5T_ENUM==dt->type) {
+	fprintf(stream, "%*s%s\n", indent, "", "Base type:");
+	H5O_dtype_debug(f, dt->parent, stream, indent+3, MAX(0, fwidth-3));
+	fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
+		"Number of members:",
+		dt->u.enumer.nmembs);
+	for (i=0; i<dt->u.enumer.nmembs; i++) {
+	    sprintf(buf, "Member %d:", i);
+	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		    buf,
+		    dt->u.enumer.name[i]);
+	    fprintf(stream, "%*s%-*s 0x", indent, "", fwidth,
+		    "Raw bytes of value:");
+	    for (k=0; k<dt->parent->size; k++) {
+		fprintf(stream, "%02x",
+			dt->u.enumer.value[i*dt->parent->size+k]);
+	    }
+	    fprintf(stream, "\n");
+	}
+	
     } else {
-        switch (dt->u.atomic.order) {
-        case H5T_ORDER_LE:
-            s = "little endian";
-            break;
-        case H5T_ORDER_BE:
-            s = "big endian";
-            break;
-        case H5T_ORDER_VAX:
-            s = "VAX";
-            break;
-        case H5T_ORDER_NONE:
-            s = "none";
-            break;
-        default:
-            sprintf(buf, "H5T_ORDER_%d", dt->u.atomic.order);
-            s = buf;
-            break;
-        }
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "Byte order:",
-                s);
-
-        fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
-                "Precision:",
-                (unsigned long) (dt->u.atomic.prec),
-                1 == dt->u.atomic.prec ? "" : "s");
-
-        fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
-                "Offset:",
-                (unsigned long) (dt->u.atomic.offset),
-                1 == dt->u.atomic.offset ? "" : "s");
-
-        switch (dt->u.atomic.lsb_pad) {
-        case H5T_PAD_ZERO:
-            s = "zero";
-            break;
-        case H5T_PAD_ONE:
-            s = "one";
-            break;
-        default:
-            s = "pad?";
-            break;
-        }
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "Low pad type:", s);
-
-        switch (dt->u.atomic.msb_pad) {
-        case H5T_PAD_ZERO:
-            s = "zero";
-            break;
-        case H5T_PAD_ONE:
-            s = "one";
-            break;
-        default:
-            s = "pad?";
-            break;
-        }
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                "High pad type:", s);
-
-        if (H5T_FLOAT == dt->type) {
-            switch (dt->u.atomic.u.f.pad) {
-            case H5T_PAD_ZERO:
-                s = "zero";
-                break;
-            case H5T_PAD_ONE:
-                s = "one";
-                break;
-            default:
-                if (dt->u.atomic.u.f.pad < 0) {
-                    sprintf(buf, "H5T_PAD_%d", -(dt->u.atomic.u.f.pad));
-                } else {
-                    sprintf(buf, "bit-%d", dt->u.atomic.u.f.pad);
-                }
-                s = buf;
-                break;
-            }
-            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Internal pad type:", s);
-
-            switch (dt->u.atomic.u.f.norm) {
-            case H5T_NORM_IMPLIED:
-                s = "implied";
-                break;
-            case H5T_NORM_MSBSET:
-                s = "msb set";
-                break;
-            case H5T_NORM_NONE:
-                s = "none";
-                break;
-            default:
-                sprintf(buf, "H5T_NORM_%d", (int) (dt->u.atomic.u.f.norm));
-                s = buf;
-            }
-            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Normalization:", s);
-
-            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                    "Sign bit location:",
-                    (unsigned long) (dt->u.atomic.u.f.sign));
-
-            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                    "Exponent location:",
-                    (unsigned long) (dt->u.atomic.u.f.epos));
-
-            fprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
-                    "Exponent bias:",
-                    (unsigned long) (dt->u.atomic.u.f.ebias));
-
-            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                    "Exponent size:",
-                    (unsigned long) (dt->u.atomic.u.f.esize));
-
-            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                    "Mantissa location:",
-                    (unsigned long) (dt->u.atomic.u.f.mpos));
-
-            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                    "Mantissa size:",
-                    (unsigned long) (dt->u.atomic.u.f.msize));
-
-        } else if (H5T_INTEGER == dt->type) {
-            switch (dt->u.atomic.u.i.sign) {
-            case H5T_SGN_NONE:
-                s = "none";
-                break;
-            case H5T_SGN_2:
-                s = "2's comp";
-                break;
-            default:
-                sprintf(buf, "H5T_SGN_%d", (int) (dt->u.atomic.u.i.sign));
-                s = buf;
-                break;
-            }
-            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Sign scheme:", s);
-
-        }
+	switch (dt->u.atomic.order) {
+	case H5T_ORDER_LE:
+	    s = "little endian";
+	    break;
+	case H5T_ORDER_BE:
+	    s = "big endian";
+	    break;
+	case H5T_ORDER_VAX:
+	    s = "VAX";
+	    break;
+	case H5T_ORDER_NONE:
+	    s = "none";
+	    break;
+	default:
+	    sprintf(buf, "H5T_ORDER_%d", dt->u.atomic.order);
+	    s = buf;
+	    break;
+	}
+	fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		"Byte order:",
+		s);
+
+	fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+		"Precision:",
+		(unsigned long)(dt->u.atomic.prec),
+		1==dt->u.atomic.prec?"":"s");
+
+	fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+		"Offset:",
+		(unsigned long)(dt->u.atomic.offset),
+		1==dt->u.atomic.offset?"":"s");
+
+	switch (dt->u.atomic.lsb_pad) {
+	case H5T_PAD_ZERO:
+	    s = "zero";
+	    break;
+	case H5T_PAD_ONE:
+	    s = "one";
+	    break;
+	default:
+	    s = "pad?";
+	    break;
+	}
+	fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		"Low pad type:", s);
+
+	switch (dt->u.atomic.msb_pad) {
+	case H5T_PAD_ZERO:
+	    s = "zero";
+	    break;
+	case H5T_PAD_ONE:
+	    s = "one";
+	    break;
+	default:
+	    s = "pad?";
+	    break;
+	}
+	fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		"High pad type:", s);
+
+	if (H5T_FLOAT == dt->type) {
+	    switch (dt->u.atomic.u.f.pad) {
+	    case H5T_PAD_ZERO:
+		s = "zero";
+		break;
+	    case H5T_PAD_ONE:
+		s = "one";
+		break;
+	    default:
+		if (dt->u.atomic.u.f.pad < 0) {
+		    sprintf(buf, "H5T_PAD_%d", -(dt->u.atomic.u.f.pad));
+		} else {
+		    sprintf(buf, "bit-%d", dt->u.atomic.u.f.pad);
+		}
+		s = buf;
+		break;
+	    }
+	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		    "Internal pad type:", s);
+
+	    switch (dt->u.atomic.u.f.norm) {
+	    case H5T_NORM_IMPLIED:
+		s = "implied";
+		break;
+	    case H5T_NORM_MSBSET:
+		s = "msb set";
+		break;
+	    case H5T_NORM_NONE:
+		s = "none";
+		break;
+	    default:
+		sprintf(buf, "H5T_NORM_%d", (int) (dt->u.atomic.u.f.norm));
+		s = buf;
+	    }
+	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		    "Normalization:", s);
+
+	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+		    "Sign bit location:",
+		    (unsigned long) (dt->u.atomic.u.f.sign));
+
+	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+		    "Exponent location:",
+		    (unsigned long) (dt->u.atomic.u.f.epos));
+
+	    fprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
+		    "Exponent bias:",
+		    (unsigned long) (dt->u.atomic.u.f.ebias));
+
+	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+		    "Exponent size:",
+		    (unsigned long) (dt->u.atomic.u.f.esize));
+
+	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+		    "Mantissa location:",
+		    (unsigned long) (dt->u.atomic.u.f.mpos));
+
+	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+		    "Mantissa size:",
+		    (unsigned long) (dt->u.atomic.u.f.msize));
+
+	} else if (H5T_INTEGER == dt->type) {
+	    switch (dt->u.atomic.u.i.sign) {
+	    case H5T_SGN_NONE:
+		s = "none";
+		break;
+	    case H5T_SGN_2:
+		s = "2's comp";
+		break;
+	    default:
+		sprintf(buf, "H5T_SGN_%d", (int) (dt->u.atomic.u.i.sign));
+		s = buf;
+		break;
+	    }
+	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+		    "Sign scheme:", s);
+
+	}
     }
 
     FUNC_LEAVE(SUCCEED);