[svn-r22748] Description:

    H5FD_FLMAP_SINGLE changed to H5FD_FLMAP_DICHOTOMY in the MPI-POSIX VFD.

Tested on:
    jam w/ parallel and fortran enabled (minor change)

1 files changed, 79 insertions, 87 deletions

diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index bea8d2b..2b15aaf 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -18,16 +18,16 @@
  *      the datatype offset for the H5T interface.
  */
 
-#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+#define H5T_PACKAGE     /* suppress error about including H5Tpkg */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5T_init_offset_interface
+#define H5_INTERFACE_INIT_FUNC      H5T_init_offset_interface
 
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Tpkg.h"		/* Datatypes				*/
+#include "H5private.h"          /* Generic Functions                        */
+#include "H5Eprivate.h"         /* Error handling                           */
+#include "H5Iprivate.h"         /* IDs                                      */
+#include "H5Tpkg.h"             /* Datatypes                                */
 
 /* Static local functions */
 static herr_t H5T_set_offset(const H5T_t *dt, size_t offset);
@@ -157,68 +157,64 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Tset_offset
+ * Function:    H5Tset_offset
  *
- * Purpose:	Sets the bit offset of the first significant bit.  The
- *		signficant bits of an atomic datum can be offset from the
- *		beginning of the memory for that datum by an amount of
- *		padding. The `offset' property specifies the number of bits
- *		of padding that appear to the "right of" the value.  That is,
- *		if we have a 32-bit datum with 16-bits of precision having
- *		the value 0x1122 then it will be layed out in memory as (from
- *		small byte address toward larger byte addresses):
+ * Purpose:     Sets the bit offset of the first significant bit.  The
+ *              signficant bits of an atomic datum can be offset from the
+ *              beginning of the memory for that datum by an amount of
+ *              padding. The `offset' property specifies the number of bits
+ *              of padding that appear to the "right of" the value.  That is,
+ *              if we have a 32-bit datum with 16-bits of precision having
+ *              the value 0x1122 then it will be layed out in memory as (from
+ *              small byte address toward larger byte addresses):
  *
- *		    Big	     Big       Little	Little
- *		    Endian   Endian    Endian	Endian
- *		    offset=0 offset=16 offset=0 offset=16
+ *                     Big         Big            Little        Little
+ *                    Endian      Endian          Endian        Endian
+ *                  offset = 0  offset = 16     offset = 0    offset = 16
  *
- *		0:  [ pad]   [0x11]    [0x22]	[ pad]
- *		1:  [ pad]   [0x22]    [0x11]	[ pad]
- *		2:  [0x11]   [ pad]    [ pad]	[0x22]
- *		3:  [0x22]   [ pad]    [ pad]	[0x11]
+ *                  0:  [ pad]   [0x11]    [0x22]   [ pad]
+ *                  1:  [ pad]   [0x22]    [0x11]   [ pad]
+ *                  2:  [0x11]   [ pad]    [ pad]   [0x22]
+ *                  3:  [0x22]   [ pad]    [ pad]   [0x11]
  *
- *		If the offset is incremented then the total size is
- *		incremented also if necessary to prevent significant bits of
- *		the value from hanging over the edge of the data type.
+ *              If the offset is incremented then the total size is
+ *              incremented also if necessary to prevent significant bits of
+ *              the value from hanging over the edge of the data type.
  *
- *		The offset of an H5T_STRING cannot be set to anything but
- *		zero.
+ *              The offset of an H5T_STRING cannot be set to anything but
+ *              zero.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Robb Matzke
- *		Wednesday, January  7, 1998
- *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Moved real work to a private function.
+ * Programmer:  Robb Matzke
+ *              Wednesday, January  7, 1998
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Tset_offset(hid_t type_id, size_t offset)
 {
-    H5T_t	*dt;
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    H5T_t       *dt;
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iz", type_id, offset);
 
     /* Check args */
-    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
-    if (H5T_STATE_TRANSIENT!=dt->shared->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
-    if (H5T_STRING == dt->shared->type && offset != 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "offset must be zero for this type")
-    if (H5T_ENUM==dt->shared->type && dt->shared->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
-    if (H5T_COMPOUND==dt->shared->type || H5T_REFERENCE==dt->shared->type || H5T_OPAQUE==dt->shared->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype")
+    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
+    if(H5T_STATE_TRANSIENT != dt->shared->state)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
+    if(H5T_STRING == dt->shared->type && offset != 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "offset must be zero for this type")
+    if(H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
+    if(H5T_COMPOUND == dt->shared->type || H5T_REFERENCE == dt->shared->type || H5T_OPAQUE == dt->shared->type)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype")
 
     /* Do the real work */
-    if (H5T_set_offset(dt, offset)<0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset")
+    if (H5T_set_offset(dt, offset) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -226,70 +222,66 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5T_set_offset
- *
- * Purpose:	Sets the bit offset of the first significant bit.  The
- *		signficant bits of an atomic datum can be offset from the
- *		beginning of the memory for that datum by an amount of
- *		padding. The `offset' property specifies the number of bits
- *		of padding that appear to the "right of" the value.  That is,
- *		if we have a 32-bit datum with 16-bits of precision having
- *		the value 0x1122 then it will be layed out in memory as (from
- *		small byte address toward larger byte addresses):
+ * Function:    H5T_set_offset
  *
- *		    Big	     Big       Little	Little
- *		    Endian   Endian    Endian	Endian
- *		    offset=0 offset=16 offset=0 offset=16
+ * Purpose:     Sets the bit offset of the first significant bit.  The
+ *              signficant bits of an atomic datum can be offset from the
+ *              beginning of the memory for that datum by an amount of
+ *              padding. The `offset' property specifies the number of bits
+ *              of padding that appear to the "right of" the value.  That is,
+ *              if we have a 32-bit datum with 16-bits of precision having
+ *              the value 0x1122 then it will be layed out in memory as (from
+ *              small byte address toward larger byte addresses):
  *
- *		0:  [ pad]   [0x11]    [0x22]	[ pad]
- *		1:  [ pad]   [0x22]    [0x11]	[ pad]
- *		2:  [0x11]   [ pad]    [ pad]	[0x22]
- *		3:  [0x22]   [ pad]    [ pad]	[0x11]
+ *                     Big         Big            Little        Little
+ *                    Endian      Endian          Endian        Endian
+ *                  offset = 0  offset = 16     offset = 0    offset = 16
  *
- *		If the offset is incremented then the total size is
- *		incremented also if necessary to prevent significant bits of
- *		the value from hanging over the edge of the data type.
+ *                  0:  [ pad]   [0x11]    [0x22]   [ pad]
+ *                  1:  [ pad]   [0x22]    [0x11]   [ pad]
+ *                  2:  [0x11]   [ pad]    [ pad]   [0x22]
+ *                  3:  [0x22]   [ pad]    [ pad]   [0x11]
  *
- *		The offset of an H5T_STRING cannot be set to anything but
- *		zero.
+ *              If the offset is incremented then the total size is
+ *              incremented also if necessary to prevent significant bits of
+ *              the value from hanging over the edge of the data type.
  *
- * Return:	Non-negative on success/Negative on failure
+ *              The offset of an H5T_STRING cannot be set to anything but
+ *              zero.
  *
- * Programmer:	Robb Matzke
- *		Wednesday, January  7, 1998
+ * Return:      SUCCEED/FAIL
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived data types.
+ * Programmer:  Robb Matzke
+ *              Wednesday, January  7, 1998
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5T_set_offset(const H5T_t *dt, size_t offset)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t      ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     assert(dt);
-    assert(H5T_STRING!=dt->shared->type || 0==offset);
-    assert(H5T_REFERENCE!=dt->shared->type);
-    assert(H5T_OPAQUE!=dt->shared->type);
-    assert(H5T_COMPOUND!=dt->shared->type);
-    assert(!(H5T_ENUM==dt->shared->type && 0==dt->shared->u.enumer.nmembs));
+    assert(H5T_STRING != dt->shared->type || 0 == offset);
+    assert(H5T_REFERENCE != dt->shared->type);
+    assert(H5T_OPAQUE != dt->shared->type);
+    assert(H5T_COMPOUND != dt->shared->type);
+    assert(!(H5T_ENUM == dt->shared->type && 0 == dt->shared->u.enumer.nmembs));
 
     if (dt->shared->parent) {
-	if (H5T_set_offset(dt->shared->parent, offset)<0)
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type")
+        if (H5T_set_offset(dt->shared->parent, offset) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type")
 
         /* 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;
     } else {
-        if (offset+dt->shared->u.atomic.prec > 8*dt->shared->size)
+        if (offset + dt->shared->u.atomic.prec > 8 * dt->shared->size)
             dt->shared->size = (offset + dt->shared->u.atomic.prec + 7) / 8;
         dt->shared->u.atomic.offset = offset;
     }