[svn-r19313] Description:

     Clean up a few compiler warnings and style issues in/near recent changes.

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (too minor to require h5committest)

4 files changed, 191 insertions, 157 deletions

diff --git a/src/H5Torder.c b/src/H5Torder.c
index ba8aa1b..590a6c7 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -18,24 +18,72 @@
  *      the datatype byte order for the H5T interface.
  */
 
+/****************/
+/* Module Setup */
+/****************/
+
 #define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
 #define H5_INTERFACE_INIT_FUNC	H5T_init_order_interface
 
 
+/***********/
+/* Headers */
+/***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Tpkg.h"		/* Datatypes				*/
 
+
+/****************/
+/* Local Macros */
+/****************/
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
+static herr_t H5T_set_order(H5T_t *dtype, H5T_order_t order);
+
+
+/*********************/
+/* Public Variables */
+/*********************/
+
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+
 
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_order_interface -- Initialize interface-specific information
 USAGE
     herr_t H5T_init_order_interface()
-
 RETURNS
     Non-negative on success/Negative on failure
 DESCRIPTION
@@ -57,36 +105,31 @@ H5T_init_order_interface(void)
  *
  * Purpose:	Returns the byte order of a datatype.
  *
- * Return:	Success:	A byte order constant
- *
+ * Return:	Success:	A byte order constant.  If the type is compound
+ *				and its members have mixed orders, this function
+ *				returns H5T_ORDER_MIXED.
  *		Failure:	H5T_ORDER_ERROR (Negative)
  *
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  * 
- * Modifications:
- *              Raymond Lu
- *              23 August 2010
- *              I added support for all data types.  If the type is compound
- *              and its members have mixed orders, this function returns 
- *              H5T_ORDER_MIXED.
  *-------------------------------------------------------------------------
  */
 H5T_order_t
 H5Tget_order(hid_t type_id)
 {
-    H5T_t		*dt;
-    H5T_order_t		ret_value;
+    H5T_t		*dt;            /* Datatype to query */
+    H5T_order_t		ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Tget_order, H5T_ORDER_ERROR)
     H5TRACE1("To", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_ORDER_ERROR, "not a datatype")
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5T_ORDER_ERROR, "not a datatype")
 
     /* Get order */
-    if((ret_value = H5T_get_order(dt)) == H5T_ORDER_ERROR)
+    if(H5T_ORDER_ERROR == (ret_value = H5T_get_order(dt)))
 	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_ORDER_ERROR, "cant't get order for specified datatype")
 
 done:
@@ -110,47 +153,49 @@ done:
 H5T_order_t
 H5T_get_order(const H5T_t *dtype)
 {
-    int         nmemb;          /* Number of members in compound & enum types */
-    int         i;              /* Local index variable */
     H5T_order_t	ret_value = H5T_ORDER_NONE;      /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_get_order, H5T_ORDER_ERROR)
 
-    /*defer to parent*/
+    /* Defer to parent */
     while(dtype->shared->parent)
         dtype = dtype->shared->parent;
 
     /* Set order for atomic type. */
-    if(H5T_IS_ATOMIC(dtype->shared)) {
+    if(H5T_IS_ATOMIC(dtype->shared))
         ret_value = dtype->shared->u.atomic.order;
-        HGOTO_DONE(ret_value)
-    }
-
-    /* Loop through all fields of compound type */
-    if(H5T_COMPOUND == dtype->shared->type) {
-        H5T_order_t memb_order = H5T_ORDER_NONE;
-	if((nmemb = H5T_get_nmembers(dtype)) < 0)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get number of members from compound data type")
-
-	/* Get order for each compound member type. */
-	for(i=0; i<nmemb; i++) {
-	    if((memb_order = H5T_get_order(dtype->shared->u.compnd.memb[i].type)) == H5T_ORDER_ERROR)
-	        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't get order for compound member")
-
-            /* Ignore the H5T_ORDER_NONE, write down the first non H5T_ORDER_NONE order. */
-            if(memb_order != H5T_ORDER_NONE && ret_value == H5T_ORDER_NONE)
-                ret_value = memb_order;
-
-            /* If the orders are mixed, stop the loop and report it.  
-             * H5T_ORDER_NONE is ignored*/
-            if(memb_order != H5T_ORDER_NONE && ret_value != H5T_ORDER_NONE && 
-                memb_order != ret_value) {
-                ret_value = H5T_ORDER_MIXED;
-                break;
-            }
-	}
-    }
-
+    else {
+        /* Check for compound datatype */
+        if(H5T_COMPOUND == dtype->shared->type) {
+            H5T_order_t memb_order = H5T_ORDER_NONE;
+            int nmemb;          /* Number of members in compound & enum types */
+            int i;              /* Local index variable */
+
+            /* Retrieve the number of members */
+            if((nmemb = H5T_get_nmembers(dtype)) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_ORDER_ERROR, "can't get number of members from compound data type")
+
+            /* Get order for each compound member type. */
+            for(i = 0; i < nmemb; i++) {
+                /* Get order for member */
+                if((memb_order = H5T_get_order(dtype->shared->u.compnd.memb[i].type)) == H5T_ORDER_ERROR)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5T_ORDER_ERROR, "can't get order for compound member")
+
+                /* Ignore the H5T_ORDER_NONE, write down the first non H5T_ORDER_NONE order. */
+                if(memb_order != H5T_ORDER_NONE && ret_value == H5T_ORDER_NONE)
+                    ret_value = memb_order;
+
+                /* If the orders are mixed, stop the loop and report it.  
+                 * (H5T_ORDER_NONE is ignored)
+                 */
+                if(memb_order != H5T_ORDER_NONE && ret_value != H5T_ORDER_NONE
+                        && memb_order != ret_value) {
+                    ret_value = H5T_ORDER_MIXED;
+                    break;
+                } /* end if */
+            } /* end for */
+        } /* end if */
+    } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -162,48 +207,45 @@ done:
  *
  * Purpose:	Sets the byte order for a datatype.
  *
+ * Notes:	There are some restrictions on this operation:
+ *		1. For enum type, members shouldn't be defined yet.
+ *		2. H5T_ORDER_NONE only works for reference and fixed-length
+ *			string.
+ *		3. For opaque type, the order will be ignored.
+ *		4. For compound type, all restrictions above apply to the 
+ *			members.
+ *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived datatypes.
- *
- *      Raymond Lu, 18 Aug 2010
- *      Now it works for all data types with some restrictions:
- *        1. For enum type, members shouldn't be defined yet.
- *        2. H5T_ORDER_NONE only works for reference and fixed-length 
- *           string.
- *        3. For opaque type, the order will be ignored.
- *        4. For compound type, all restrictions above apply to the 
- *           members.
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Tset_order(hid_t type_id, H5T_order_t order)
 {
-    H5T_t	*dt = NULL;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t	*dt;                    /* Datatype to modify */
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Tset_order, FAIL)
     H5TRACE2("e", "iTo", type_id, order);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if (order < H5T_ORDER_LE || order > H5T_ORDER_NONE || order == H5T_ORDER_MIXED)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal byte order")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
-
-    if (H5T_set_order(dt, order) < 0)
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+	HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
+    if(order < H5T_ORDER_LE || order > H5T_ORDER_NONE || order == H5T_ORDER_MIXED)
+	HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order")
+    if(H5T_STATE_TRANSIENT != dt->shared->state)
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype is read-only")
+
+    /* Call internal routine to set the order */
+    if(H5T_set_order(dt, order) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't set order")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Tset_order() */
 
 
 /*-------------------------------------------------------------------------
@@ -216,51 +258,52 @@ done:
  * Programmer:	Raymond Lu
  *		13 August 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-herr_t
+static herr_t
 H5T_set_order(H5T_t *dtype, H5T_order_t order)
 {
-    int         nmemb;              /* Number of members in compound & enum types */
-    int         i;                  /* Local index variable */
-    herr_t      ret_value=SUCCEED;  /* Return value */
+    herr_t      ret_value = SUCCEED;  /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_set_order, FAIL)
 
-    if (H5T_ENUM==dtype->shared->type && dtype->shared->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after enum members are defined")
+    if(H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0)
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined")
 
     /* For derived data type, defer to parent */ 
-    while (dtype->shared->parent)
+    while(dtype->shared->parent)
         dtype = dtype->shared->parent;
 
-    if (order == H5T_ORDER_NONE && !(H5T_REFERENCE == dtype->shared->type || 
+    /* Check for setting order on inappropriate datatype */
+    if(order == H5T_ORDER_NONE && !(H5T_REFERENCE == dtype->shared->type || 
             H5T_OPAQUE == dtype->shared->type || H5T_IS_FIXED_STRING(dtype->shared)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal byte order")
+	HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order for type")
 
     /* For atomic data type */
-    if (H5T_IS_ATOMIC(dtype->shared)) {
+    if(H5T_IS_ATOMIC(dtype->shared))
         dtype->shared->u.atomic.order = order;
-        HGOTO_DONE(ret_value)
-    }
-
-    /* Loop through all fields of compound type */
-    if(H5T_COMPOUND == dtype->shared->type) {
-	if((nmemb = H5T_get_nmembers(dtype)) < 0)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get number of members from compound data type")
-
-        if(nmemb == 0)
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "no member is in the compound data type")
-
-	/* Set order for each compound member type. */
-	for(i=0; i<nmemb; i++) {
-	    if(H5T_set_order(dtype->shared->u.compnd.memb[i].type, order) < 0)
-	        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't set order for compound member")
-	}
-    }
+    else {
+        /* Check for compound datatype */
+        if(H5T_COMPOUND == dtype->shared->type) {
+            int nmemb;          /* Number of members in type */
+            int i;              /* Local index variable */
+
+            /* Retrieve the number of fields in the compound datatype */
+            if((nmemb = H5T_get_nmembers(dtype)) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get number of members from compound data type")
+
+            /* Check for uninitialized compound datatype */
+            if(nmemb == 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_UNINITIALIZED, FAIL, "no member is in the compound data type")
+
+            /* Loop through all fields of compound type, setting the order */
+            for(i = 0; i < nmemb; i++)
+                if(H5T_set_order(dtype->shared->u.compnd.memb[i].type, order) < 0)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set order for compound member")
+        } /* end if */
+    } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5T_set_order() */
+
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 8dac972..c70eea0 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -110,7 +110,6 @@ H5_DLL H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method);
 H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable);
 H5_DLL herr_t H5T_close(H5T_t *dt);
 H5_DLL H5T_t *H5T_get_super(const H5T_t *dt);
-H5_DLL herr_t H5T_set_order(H5T_t *dtype, H5T_order_t order);
 H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal);
 H5_DLL htri_t H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api);
 H5_DLL size_t H5T_get_size(const H5T_t *dt);
diff --git a/test/dsets.c b/test/dsets.c
index 2d31a79..8a474b4 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1055,8 +1055,8 @@ test_conv_buffer(hid_t fid)
   if((arr_type3 = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, dimsc)) < 0) goto error;
 
   if(H5Tinsert(ctype1, "A", HOFFSET(CmpField, a), arr_type1) < 0) goto error;
-  if(H5Tinsert (ctype1, "B", HOFFSET(CmpField, b), arr_type2) < 0) goto error;
-  if(H5Tinsert (ctype1, "C", HOFFSET(CmpField, c), arr_type3) < 0) goto error;
+  if(H5Tinsert(ctype1, "B", HOFFSET(CmpField, b), arr_type2) < 0) goto error;
+  if(H5Tinsert(ctype1, "C", HOFFSET(CmpField, c), arr_type3) < 0) goto error;
 
   /* Create the dataset */
   if((dataset = H5Dcreate2(fid, DSET_CONV_BUF_NAME, ctype1, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
@@ -1067,18 +1067,18 @@ test_conv_buffer(hid_t fid)
   if((arr_type4 = H5Tarray_create2(H5T_NATIVE_FLOAT, 1, dimsb)) < 0) goto error;
   if((arr_type5 = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, dimsc)) < 0) goto error;
 
-  if(H5Tinsert (ctype2, "B", HOFFSET(CmpFieldR, b), arr_type4) < 0) goto error;
-  if(H5Tinsert (ctype2, "C", HOFFSET(CmpFieldR, c), arr_type5) < 0) goto error;
+  if(H5Tinsert(ctype2, "B", HOFFSET(CmpFieldR, b), arr_type4) < 0) goto error;
+  if(H5Tinsert(ctype2, "C", HOFFSET(CmpFieldR, c), arr_type5) < 0) goto error;
 
   /* Read should succeed since library will set conversion buffer big enough */
   cfrR = (CmpFieldR *)HDcalloc((size_t)1, sizeof(CmpFieldR));
   if(H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, H5P_DEFAULT, cfrR) < 0) goto error;
 
   /* Read should fail since conversion buffer isn't big enough */
-  xfer_list = H5Pcreate (H5P_DATASET_XFER);
-  size = (DIM2*DIM3*(sizeof(int))+ DIM2*(sizeof(float))+
-         DIM3*(sizeof(double)));
-  if(H5Pset_buffer (xfer_list, size, NULL, NULL) < 0) goto error;
+  xfer_list = H5Pcreate(H5P_DATASET_XFER);
+  size = (DIM2 * DIM3 * (sizeof(int))+ DIM2 * (sizeof(float))+
+         DIM3 * (sizeof(double)));
+  if(H5Pset_buffer(xfer_list, size, NULL, NULL) < 0) goto error;
 
   H5E_BEGIN_TRY {
     status = H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, xfer_list, cfrR);
@@ -1090,9 +1090,9 @@ test_conv_buffer(hid_t fid)
   }
 
   /* Read will succeed since conversion buffer is big enough */
-  size = (DIM1*DIM2*DIM3*(sizeof(int))+ DIM2*(sizeof(float))+
-         DIM3*(sizeof(double)));
-  if(H5Pset_buffer (xfer_list, size, NULL, NULL) < 0) goto error;
+  size = (DIM1 * DIM2 * DIM3 * (sizeof(int))+ DIM2 * (sizeof(float))+
+         DIM3 * (sizeof(double)));
+  if(H5Pset_buffer(xfer_list, size, NULL, NULL) < 0) goto error;
 
   if(H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, xfer_list, cfrR) < 0) goto error;
 
diff --git a/test/dtypes.c b/test/dtypes.c
index dfa19dd..0a3b6e4 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -4859,9 +4859,6 @@ opaque_funcs(void)
         TEST_ERROR
     } /* end if */
 
-    /* No effect on opaque type */
-    if(H5Tset_order(type, H5T_ORDER_BE) < 0) TEST_ERROR
-
     H5E_BEGIN_TRY {
         sign = H5Tget_sign(type);
     } H5E_END_TRY;
@@ -5761,14 +5758,11 @@ error:
  *              H5T_ORDER_NONE cannot be set.
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
  *
  * Programmer:  Neil Fortner
  *              January 23, 2009
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5844,8 +5838,10 @@ test_set_order(void)
 
     /* Opaque - No effect on the order */
     if ((dtype = H5Tcreate(H5T_OPAQUE, (size_t)96)) < 0) TEST_ERROR
+    if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR;
     if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) TEST_ERROR
     if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) TEST_ERROR
+    if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR;
     if (H5Tclose(dtype) < 0) TEST_ERROR
 
     /* Compound */
@@ -5923,14 +5919,11 @@ error:
  *              type.
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
  *
  * Programmer:  Raymond Lu
  *              18 August 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5950,96 +5943,95 @@ test_set_order_compound(hid_t fapl)
         atomic_cmpd d[3][4];
     } complex_cmpd;
 
-    hid_t       file;
-    hid_t       cmpd, memb_cmpd, memb_array1, memb_array2, cmpd_array;
-    hid_t       vl_id;
-    H5T_order_t order;              /* Byte order */
+    hid_t       file = -1;
+    hid_t       cmpd = -1, memb_cmpd = -1, memb_array1 = -1, memb_array2 = -1, cmpd_array = -1;
+    hid_t       vl_id = -1;
     hsize_t     dims[2] = {3, 4};   /* Array dimenstions */
     char	filename[1024];
     herr_t      ret;                /* Generic return value */
 
     TESTING("H5Tset/get_order for compound type");
 
-    if ((memb_cmpd = H5Tcreate(H5T_COMPOUND, sizeof(atomic_cmpd))) < 0) TEST_ERROR
-    if (H5Tinsert(memb_cmpd, "i", HOFFSET(atomic_cmpd, i), H5T_NATIVE_INT) < 0) TEST_ERROR 
-    if (H5Tinsert(memb_cmpd, "c", HOFFSET(atomic_cmpd, c), H5T_NATIVE_CHAR) < 0) TEST_ERROR
-    if (H5Tinsert(memb_cmpd, "s", HOFFSET(atomic_cmpd, s), H5T_NATIVE_SHORT) < 0) TEST_ERROR
-    if (H5Tinsert(memb_cmpd, "f", HOFFSET(atomic_cmpd, f), H5T_NATIVE_FLOAT) < 0) TEST_ERROR
+    if((memb_cmpd = H5Tcreate(H5T_COMPOUND, sizeof(atomic_cmpd))) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(memb_cmpd, "i", HOFFSET(atomic_cmpd, i), H5T_NATIVE_INT) < 0) FAIL_STACK_ERROR 
+    if(H5Tinsert(memb_cmpd, "c", HOFFSET(atomic_cmpd, c), H5T_NATIVE_CHAR) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(memb_cmpd, "s", HOFFSET(atomic_cmpd, s), H5T_NATIVE_SHORT) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(memb_cmpd, "f", HOFFSET(atomic_cmpd, f), H5T_NATIVE_FLOAT) < 0) FAIL_STACK_ERROR
 
     /* Set the order to little-endian. */
-    if (H5Tset_order(memb_cmpd, H5T_ORDER_BE) < 0) TEST_ERROR
+    if(H5Tset_order(memb_cmpd, H5T_ORDER_BE) < 0) FAIL_STACK_ERROR
 
-    /* Create the simple array datatype */
+    /* Create the array datatypes */
     memb_array1 = H5Tarray_create2(H5T_NATIVE_DOUBLE, 2, dims);
     memb_array2 = H5Tarray_create2(memb_cmpd, 2, dims);
 
     /* Set the order to big-endian. */
-    if (H5Tset_order(memb_array1, H5T_ORDER_LE) < 0) TEST_ERROR
+    if(H5Tset_order(memb_array1, H5T_ORDER_LE) < 0) FAIL_STACK_ERROR
 
     /* Create a variable-length datatype */
-    if ((vl_id = H5Tvlen_create(H5T_NATIVE_UINT)) < 0) TEST_ERROR
+    if((vl_id = H5Tvlen_create(H5T_NATIVE_UINT)) < 0) FAIL_STACK_ERROR
 
     /* Create a compound type using the types above. */
-    if ((cmpd = H5Tcreate(H5T_COMPOUND, sizeof(complex_cmpd))) < 0) TEST_ERROR
-    if (H5Tinsert(cmpd, "a", HOFFSET(complex_cmpd, a), memb_cmpd) < 0) TEST_ERROR 
-    if (H5Tinsert(cmpd, "vl_type", HOFFSET(complex_cmpd, vl), vl_id) < 0) TEST_ERROR 
-    if (H5Tinsert(cmpd, "b", HOFFSET(complex_cmpd, b), memb_array1) < 0) TEST_ERROR 
-    if (H5Tinsert(cmpd, "d", HOFFSET(complex_cmpd, d), memb_array2) < 0) TEST_ERROR 
+    if((cmpd = H5Tcreate(H5T_COMPOUND, sizeof(complex_cmpd))) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(cmpd, "a", HOFFSET(complex_cmpd, a), memb_cmpd) < 0) FAIL_STACK_ERROR 
+    if(H5Tinsert(cmpd, "vl_type", HOFFSET(complex_cmpd, vl), vl_id) < 0) FAIL_STACK_ERROR 
+    if(H5Tinsert(cmpd, "b", HOFFSET(complex_cmpd, b), memb_array1) < 0) FAIL_STACK_ERROR 
+    if(H5Tinsert(cmpd, "d", HOFFSET(complex_cmpd, d), memb_array2) < 0) FAIL_STACK_ERROR 
 
     /* The order should be mixed now. */
-    if((order = H5Tget_order(cmpd)) != H5T_ORDER_MIXED) TEST_ERROR 
+    if(H5Tget_order(cmpd) != H5T_ORDER_MIXED) FAIL_STACK_ERROR 
 
     /* Create an array of the compound type above */
     cmpd_array = H5Tarray_create2(cmpd, 2, dims);
 
     /* The order of the array type should be the same as the compound type */
-    if((order = H5Tget_order(cmpd_array)) != H5T_ORDER_MIXED) TEST_ERROR 
+    if(H5Tget_order(cmpd_array) != H5T_ORDER_MIXED) FAIL_STACK_ERROR 
 
     /* Verify that the order can't be 'none'. */
     H5E_BEGIN_TRY
         ret = H5Tset_order(cmpd, H5T_ORDER_NONE);
     H5E_END_TRY
-    if (ret >= 0) TEST_ERROR
+    if(ret >= 0) TEST_ERROR
 
     /* Verify that the order can't be 'mixed'. */
     H5E_BEGIN_TRY
         ret = H5Tset_order(cmpd, H5T_ORDER_MIXED);
     H5E_END_TRY
-    if (ret >= 0) TEST_ERROR
+    if(ret >= 0) TEST_ERROR
 
     /* Change the order of the compound type to big-endian*/
-    if (H5Tset_order(cmpd, H5T_ORDER_BE) < 0) TEST_ERROR
+    if(H5Tset_order(cmpd, H5T_ORDER_BE) < 0) FAIL_STACK_ERROR
 
     /* Verify that the order of the compound type is big-endian */
-    if ((order = H5Tget_order(cmpd)) != H5T_ORDER_BE) TEST_ERROR 
+    if(H5Tget_order(cmpd) != H5T_ORDER_BE) FAIL_STACK_ERROR 
 
     /* Change the order of the array type to little-endian*/
-    if (H5Tset_order(cmpd_array, H5T_ORDER_LE) < 0) TEST_ERROR
+    if(H5Tset_order(cmpd_array, H5T_ORDER_LE) < 0) FAIL_STACK_ERROR
 
     /* Verify that the order of the array type is little-endian */
-    if ((order = H5Tget_order(cmpd_array)) != H5T_ORDER_LE) TEST_ERROR 
+    if(H5Tget_order(cmpd_array) != H5T_ORDER_LE) FAIL_STACK_ERROR 
 
     /* Create file */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
 
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Commit the data type */
-    if(H5Tcommit2(file, "compound", cmpd, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Tcommit2(file, "compound", cmpd, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Verify that committed type can't change order */
     H5E_BEGIN_TRY
         ret = H5Tset_order(cmpd, H5T_ORDER_LE);
     H5E_END_TRY
-    if (ret >= 0) TEST_ERROR
-
-    if (H5Tclose(memb_cmpd) < 0) TEST_ERROR
-    if (H5Tclose(memb_array1) < 0) TEST_ERROR
-    if (H5Tclose(memb_array2) < 0) TEST_ERROR
-    if (H5Tclose(vl_id) < 0) TEST_ERROR
-    if (H5Tclose(cmpd) < 0) TEST_ERROR
-    if (H5Tclose(cmpd_array) < 0) TEST_ERROR
-    if (H5Fclose(file) < 0) TEST_ERROR
+    if(ret >= 0) TEST_ERROR
+
+    if(H5Tclose(memb_cmpd) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(memb_array1) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(memb_array2) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(vl_id) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(cmpd) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(cmpd_array) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     PASSED();
     return 0;