[svn-r15609] Description:

    Omnibus compiler warning cleanup & some reformatting also.

Tested on:
    Mac OS X/32 10.5.4 (amazon)
    Too minor to require h5committest

1 files changed, 130 insertions, 112 deletions

diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index 9dd426e..d9b5974 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -18,34 +18,77 @@
  *      in the H5T interface.
  */
 
+/****************/
+/* Module Setup */
+/****************/
+
 #define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
 
 /* Interface initialization */
 #define H5_INTERFACE_INIT_FUNC	H5T_init_compound_interface
 
 
+/***********/
+/* Headers */
+/***********/
 #include "H5private.h"		/*generic functions			  */
 #include "H5Eprivate.h"		/*error handling			  */
 #include "H5Iprivate.h"		/*ID functions		   		  */
 #include "H5MMprivate.h"	/*memory management			  */
 #include "H5Tpkg.h"		/*data-type functions			  */
 
-/* Static local functions */
+/****************/
+/* Local Macros */
+/****************/
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
 static herr_t H5T_pack(const H5T_t *dt);
 
+
+/*********************/
+/* Public Variables */
+/*********************/
+
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+
 
 /*--------------------------------------------------------------------------
 NAME
    H5T_init_compound_interface -- Initialize interface-specific information
 USAGE
     herr_t H5T_init_compound_interface()
-
 RETURNS
     Non-negative on success/Negative on failure
 DESCRIPTION
     Initializes any interface-specific data or routines.  (Just calls
-    H5T_init_iterface currently).
-
+    H5T_init() currently).
 --------------------------------------------------------------------------*/
 static herr_t
 H5T_init_compound_interface(void)
@@ -79,24 +122,24 @@ H5T_init_compound_interface(void)
 size_t
 H5Tget_member_offset(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt = NULL;
-    size_t	ret_value;
+    H5T_t	*dt;            /* Datatype to query */
+    size_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Tget_member_offset, 0)
     H5TRACE2("z", "iIu", type_id, membno);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a compound datatype")
-    if (membno >= dt->shared->u.compnd.nmembs)
+    if(membno >= dt->shared->u.compnd.nmembs)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid member number")
 
     /* Value */
-    ret_value = H5T_get_member_offset(dt, membno);
+    ret_value = H5T_GET_MEMBER_OFFSET(dt->shared, membno);
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Tget_member_offset() */
 
 
 /*-------------------------------------------------------------------------
@@ -116,25 +159,18 @@ done:
  * Programmer:	Raymond Lu
  *		October 8, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 size_t
 H5T_get_member_offset(const H5T_t *dt, unsigned membno)
 {
-    size_t	ret_value;
-
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_member_offset)
 
-    assert(dt);
-    assert(membno < dt->shared->u.compnd.nmembs);
+    HDassert(dt);
+    HDassert(membno < dt->shared->u.compnd.nmembs);
 
-    /* Value */
-    ret_value = dt->shared->u.compnd.memb[membno].offset;
-
-    FUNC_LEAVE_NOAPI(ret_value)
-}
+    FUNC_LEAVE_NOAPI(dt->shared->u.compnd.memb[membno].offset)
+} /* end H5T_get_member_offset() */
 
 
 /*-------------------------------------------------------------------------
@@ -156,21 +192,22 @@ H5T_get_member_offset(const H5T_t *dt, unsigned membno)
 H5T_class_t
 H5Tget_member_class(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt = NULL;
-    H5T_class_t	ret_value;
+    H5T_t	*dt;            /* Datatype to query */
+    H5T_class_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Tget_member_class, H5T_NO_CLASS)
     H5TRACE2("Tt", "iIu", type_id, membno);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a compound datatype")
-    if (membno >= dt->shared->u.compnd.nmembs)
+    if(membno >= dt->shared->u.compnd.nmembs)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5T_NO_CLASS, "invalid member number")
 
     /* Get the type's class.  We have to use this function to get type class
-     * because of the concern of variable-length string. */
-    ret_value = H5T_get_class(dt->shared->u.compnd.memb[membno].type, FALSE);
+     *  because of the concern of variable-length string.
+     */
+    ret_value = H5T_GET_CLASS(dt->shared->u.compnd.memb[membno].type->shared, FALSE);
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -193,42 +230,35 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- *
- * 	Robb Matzke, 4 Jun 1998
- *	If the member type is a named type then this function returns a
- *	handle to the re-opened named type.
- *
  *-------------------------------------------------------------------------
  */
 hid_t
 H5Tget_member_type(hid_t type_id, unsigned membno)
 {
-    H5T_t	*dt = NULL, *memb_dt = NULL;
-    hid_t	ret_value;
+    H5T_t	*dt;                    /* Datatype to query */
+    H5T_t	*memb_dt = NULL;        /* Member datatype */
+    hid_t	ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Tget_member_type, FAIL)
     H5TRACE2("i", "iIu", type_id, membno);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
-    if (membno >= dt->shared->u.compnd.nmembs)
+    if(membno >= dt->shared->u.compnd.nmembs)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number")
-    if ((memb_dt=H5T_get_member_type(dt, membno, H5T_COPY_REOPEN))==NULL)
+    if(NULL == (memb_dt = H5T_get_member_type(dt, membno, H5T_COPY_REOPEN)))
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to retrieve member type")
-    if ((ret_value = H5I_register(H5I_DATATYPE, memb_dt, TRUE)) < 0)
+    if((ret_value = H5I_register(H5I_DATATYPE, memb_dt, TRUE)) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable register datatype atom")
 
 done:
-    if(ret_value<0) {
-        if(memb_dt!=NULL)
-            if(H5T_close(memb_dt)<0)
-	        HDONE_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "can't close datatype")
-    } /* end if */
+    if(ret_value < 0)
+        if(memb_dt && H5T_close(memb_dt) < 0)
+            HDONE_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "can't close datatype")
 
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Tget_member_type() */
 
 
 /*-------------------------------------------------------------------------
@@ -246,27 +276,25 @@ done:
  * Programmer:	Raymond Lu
  *	        October 8, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5T_t *
 H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method)
 {
-    H5T_t	*ret_value = NULL;
+    H5T_t	*ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_get_member_type, NULL)
 
-    assert(dt);
-    assert(membno < dt->shared->u.compnd.nmembs);
+    HDassert(dt);
+    HDassert(membno < dt->shared->u.compnd.nmembs);
 
     /* Copy datatype into an atom */
-    if (NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, method)))
+    if(NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, method)))
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy member datatype")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5T_get_member_type() */
 
 
 /*-------------------------------------------------------------------------
@@ -275,31 +303,24 @@ done:
  * Purpose:	Returns the size of the specified member.
  *
  * Return:	Success:	The size in bytes of the member's datatype.
- *
  *		Failure:        0
  *
  * Programmer:	Quincey Koziol
  *	        October 4, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 size_t
 H5T_get_member_size(const H5T_t *dt, unsigned membno)
 {
-    size_t	ret_value = 0;
-
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_member_size)
 
-    assert(dt);
-    assert(membno < dt->shared->u.compnd.nmembs);
+    HDassert(dt);
+    HDassert(membno < dt->shared->u.compnd.nmembs);
 
-    /* Value */
-    ret_value = dt->shared->u.compnd.memb[membno].type->shared->size;
 
-    FUNC_LEAVE_NOAPI(ret_value)
-}
+    FUNC_LEAVE_NOAPI(dt->shared->u.compnd.memb[membno].type->shared->size)
+} /* end H5T_get_member_size() */
 
 
 /*-------------------------------------------------------------------------
@@ -329,32 +350,32 @@ H5T_get_member_size(const H5T_t *dt, unsigned membno)
 herr_t
 H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id)
 {
-    H5T_t	*parent = NULL;		/*the compound parent datatype */
-    H5T_t	*member = NULL;		/*the atomic member type	*/
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t	*parent;		/* The compound parent datatype */
+    H5T_t	*member;		/* The member datatype	*/
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Tinsert, FAIL)
     H5TRACE4("e", "i*szi", parent_id, name, offset, member_id);
 
     /* Check args */
-    if (parent_id==member_id)
+    if(parent_id == member_id)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't insert compound datatype within itself")
-    if (NULL == (parent = H5I_object_verify(parent_id,H5I_DATATYPE)) || H5T_COMPOUND != parent->shared->type)
+    if(NULL == (parent = (H5T_t *)H5I_object_verify(parent_id, H5I_DATATYPE)) || H5T_COMPOUND != parent->shared->type)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
-    if (H5T_STATE_TRANSIENT!=parent->shared->state)
+    if(H5T_STATE_TRANSIENT != parent->shared->state)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "parent type read-only")
-    if (!name || !*name)
+    if(!name || !*name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no member name")
-    if (NULL == (member = H5I_object_verify(member_id,H5I_DATATYPE)))
+    if(NULL == (member = (H5T_t *)H5I_object_verify(member_id, H5I_DATATYPE)))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Insert */
-    if (H5T_insert(parent, name, offset, member) < 0)
+    if(H5T_insert(parent, name, offset, member) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "unable to insert member")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Tinsert() */
 
 
 /*-------------------------------------------------------------------------
@@ -375,23 +396,23 @@ done:
 herr_t
 H5Tpack(hid_t type_id)
 {
-    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(H5Tpack, FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
-    if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_detect_class(dt,H5T_COMPOUND)<=0)
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_detect_class(dt, H5T_COMPOUND) <= 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype")
 
     /* Pack */
-    if (H5T_pack(dt) < 0)
+    if(H5T_pack(dt) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack compound datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
-}
+} /* end H5Tpack() */
 
 
 /*-------------------------------------------------------------------------
@@ -407,17 +428,15 @@ done:
  * Programmer:	Robb Matzke
  *		Monday, December  8, 1997
  *
- * Modifications:
- *  Took out arrayness parameters - QAK, 10/6/00
- *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
 {
-    unsigned	idx, i;
+    unsigned	idx;                        /* Index of member to insert */
     size_t	total_size;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    unsigned	i;                          /* Local index variable */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_insert, FAIL)
 
@@ -436,10 +455,10 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
     total_size = member->shared->size;
     for(i = 0; i < parent->shared->u.compnd.nmembs; i++)
 	if((offset <= parent->shared->u.compnd.memb[i].offset &&
-                 offset + total_size > parent->shared->u.compnd.memb[i].offset) ||
+                 (offset + total_size) > parent->shared->u.compnd.memb[i].offset) ||
                 (parent->shared->u.compnd.memb[i].offset <= offset &&
-                 parent->shared->u.compnd.memb[i].offset +
-                 parent->shared->u.compnd.memb[i].size > offset))
+                 (parent->shared->u.compnd.memb[i].offset +
+                 parent->shared->u.compnd.memb[i].size) > offset))
 	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "member overlaps with another member")
 
     /* Does the new member overlap the end of the compound type? */
@@ -449,10 +468,10 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
     /* Increase member array if necessary */
     if(parent->shared->u.compnd.nmembs >= parent->shared->u.compnd.nalloc) {
         unsigned na = MAX(1, parent->shared->u.compnd.nalloc * 2);
-        H5T_cmemb_t *x = H5MM_realloc(parent->shared->u.compnd.memb, na * sizeof(H5T_cmemb_t));
+        H5T_cmemb_t *x = (H5T_cmemb_t *)H5MM_realloc(parent->shared->u.compnd.memb, na * sizeof(H5T_cmemb_t));
 
         if(!x)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed")
         parent->shared->u.compnd.nalloc = na;
         parent->shared->u.compnd.memb = x;
     } /* end if */
@@ -519,28 +538,24 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5T_pack(const H5T_t *dt)
 {
-    unsigned	i;
-    size_t	offset;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5T_pack)
 
-    assert(dt);
+    HDassert(dt);
 
-    if(H5T_detect_class(dt,H5T_COMPOUND)>0) {
+    if(H5T_detect_class(dt, H5T_COMPOUND) > 0) {
         /* If datatype has been packed, skip packing it and indicate success */
-        if(H5T_is_packed(dt)== TRUE)
+        if(TRUE == H5T_is_packed(dt))
             HGOTO_DONE(SUCCEED)
 
         /* Check for packing unmodifiable datatype */
-        if (H5T_STATE_TRANSIENT!=dt->shared->state)
+        if(H5T_STATE_TRANSIENT != dt->shared->state)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is read-only")
 
         if(dt->shared->parent) {
@@ -548,25 +563,28 @@ H5T_pack(const H5T_t *dt)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack parent of datatype")
 
             /* Adjust size of datatype appropriately */
-            if(dt->shared->type==H5T_ARRAY)
+            if(dt->shared->type == H5T_ARRAY)
                 dt->shared->size = dt->shared->parent->shared->size * dt->shared->u.array.nelem;
-            else if(dt->shared->type!=H5T_VLEN)
+            else if(dt->shared->type != H5T_VLEN)
                 dt->shared->size = dt->shared->parent->shared->size;
         } /* end if */
-        else if(dt->shared->type==H5T_COMPOUND) {
+        else if(dt->shared->type == H5T_COMPOUND) {
+            size_t	offset;                 /* Offset of member */
+            unsigned i;                     /* Local index variable */
+
             /* Recursively pack the members */
-            for (i=0; i<dt->shared->u.compnd.nmembs; i++) {
-                if (H5T_pack(dt->shared->u.compnd.memb[i].type) < 0)
+            for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
+                if(H5T_pack(dt->shared->u.compnd.memb[i].type) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack part of a compound datatype")
 
                 /* Update the member size */
                 dt->shared->u.compnd.memb[i].size = (dt->shared->u.compnd.memb[i].type)->shared->size;
-            }
+            } /* end for */
 
             /* Remove padding between members */
-            if(H5T_sort_value(dt, NULL)<0)
+            if(H5T_sort_value(dt, NULL) < 0)
 		HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOMPARE, FAIL, "value sort failed")
-            for (i=0, offset=0; i<dt->shared->u.compnd.nmembs; i++) {
+            for(i = 0, offset = 0; i < dt->shared->u.compnd.nmembs; i++) {
                 dt->shared->u.compnd.memb[i].offset = offset;
                 offset += dt->shared->u.compnd.memb[i].size;
             }
@@ -575,13 +593,13 @@ H5T_pack(const H5T_t *dt)
             dt->shared->size = MAX(1, offset);
 
             /* Mark the type as packed now */
-            dt->shared->u.compnd.packed=TRUE;
+            dt->shared->u.compnd.packed = TRUE;
         } /* end if */
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5T_pack() */
 
 
 /*-------------------------------------------------------------------------
@@ -602,19 +620,19 @@ done:
 htri_t
 H5T_is_packed(const H5T_t *dt)
 {
-    htri_t      ret_value=TRUE;       /* Return value */
+    htri_t      ret_value = TRUE;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_is_packed)
 
-    assert(dt);
+    HDassert(dt);
 
     /* Go up the chain as far as possible */
     while(dt->shared->parent)
-        dt=dt->shared->parent;
+        dt = dt->shared->parent;
 
     /* If this is a compound datatype, check if it is packed */
-    if(dt->shared->type==H5T_COMPOUND)
-        ret_value=(htri_t)dt->shared->u.compnd.packed;
+    if(dt->shared->type == H5T_COMPOUND)
+        ret_value = (htri_t)dt->shared->u.compnd.packed;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_is_packed() */