[svn-r19314] Description:

    Bring r19313 from trunk to 1.8 branch:

    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)

1 files changed, 142 insertions, 99 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() */
+