[svn-r230] Changes were actually made by Robb. I am commiting them for him

while he is visiting LLNL.  I changed the default creation template
offset and length to 4.  Will fix the problem later.

Changes since 19980205
----------------------

./src/H5H.c
./src/H5Hprivate.h
./src/H5O.c
./src/H5Ocont.c
./src/H5Odtype.c
./src/H5Oefl.c
./src/H5Olayout.c
./src/H5Oname.c
./src/H5Onull.c
./src/H5Oprivate.h
./src/H5Odspace.c
./src/H5Ostab.c
./src/debug.c
./html/H5.format.html
        Added an extra 4-byte field after the heap magic number for
        alignment on the DEC alpha. Changed object header message
        alignment to 8-bytes.

./src/H5F.c
./src/H5Farray.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5Gnode.c
./src/H5O.c
./src/H5Odtype.c
./src/H5P.c
./src/H5Pprivate.h
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5Tpublic.h
./src/H5V.c
./src/H5detect.c
./test/cmpd_dset.c
./test/dsets.c
./test/dtypes.c
./test/extend.c
./test/hyperslab.c
./test/istore.c
./test/th5p.c
./test/theap.c
        Fixed a few irix64 warnings regarding size_t vs. int,
        variables set but not used, printf formats

./config/irix64
        Added `-woff 1196' to get rid of errors about __vfork() being
        implicitly defined in a system header file.

./src/H5B.c
        Fixed a stack alignment problem.

1 files changed, 24 insertions, 26 deletions

diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index a3d66d6..5972cca 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -14,33 +14,32 @@
 #include <H5Oprivate.h>
 
 /* PRIVATE PROTOTYPES */
-static void            *H5O_layout_decode(H5F_t *f, size_t raw_size, const uint8 *p);
-static herr_t           H5O_layout_encode(H5F_t *f, size_t size, uint8 *p,
-                                          const void *_mesg);
-static void            *H5O_layout_copy(const void *_mesg, void *_dest);
-static size_t           H5O_layout_size(H5F_t *f, const void *_mesg);
-static herr_t           H5O_layout_debug(H5F_t *f, const void *_mesg, FILE * stream,
-                                         intn indent, intn fwidth);
+static void *H5O_layout_decode(H5F_t *f, size_t raw_size, const uint8 *p);
+static herr_t H5O_layout_encode(H5F_t *f, size_t size, uint8 *p,
+				const void *_mesg);
+static void *H5O_layout_copy(const void *_mesg, void *_dest);
+static size_t H5O_layout_size(H5F_t *f, const void *_mesg);
+static herr_t H5O_layout_debug(H5F_t *f, const void *_mesg, FILE * stream,
+			       intn indent, intn fwidth);
 
 /* This message derives from H5O */
-const H5O_class_t       H5O_LAYOUT[1] =
-{
-    {
-        H5O_LAYOUT_ID,          /*message id number             */
-        "layout",               /*message name for debugging    */
-        sizeof(H5O_layout_t),   /*native message size           */
-        H5O_layout_decode,      /*decode message                */
-        H5O_layout_encode,      /*encode message                */
-        H5O_layout_copy,        /*copy the native value         */
-        H5O_layout_size,        /*size of message on disk       */
-        NULL,                   /*reset method                  */
-        H5O_layout_debug,       /*debug the message             */
-    }};
+const H5O_class_t H5O_LAYOUT[1] = {{
+    H5O_LAYOUT_ID,          /*message id number             */
+    "layout",               /*message name for debugging    */
+    sizeof(H5O_layout_t),   /*native message size           */
+    H5O_layout_decode,      /*decode message                */
+    H5O_layout_encode,      /*encode message                */
+    H5O_layout_copy,        /*copy the native value         */
+    H5O_layout_size,        /*size of message on disk       */
+    NULL,                   /*reset method                  */
+    H5O_layout_debug,       /*debug the message             */
+}};
 
 /* Interface initialization */
 #define PABLO_MASK      H5O_layout_mask
-static hbool_t          interface_initialize_g = FALSE;
+static hbool_t interface_initialize_g = FALSE;
 #define INTERFACE_INIT  NULL
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5O_layout_decode
@@ -75,7 +74,7 @@ H5O_layout_decode(H5F_t *f, size_t raw_size, const uint8 *p)
     mesg = H5MM_xcalloc(1, sizeof(H5O_layout_t));
     H5F_addr_decode(f, &p, &(mesg->addr));
     mesg->ndims = *p++;
-    assert(raw_size == H5O_layout_size(f, mesg));
+    assert(raw_size == H5O_ALIGN (H5O_layout_size(f, mesg)));
 
     /* Layout class */
     mesg->type = *p++;
@@ -120,7 +119,7 @@ H5O_layout_encode(H5F_t *f, size_t raw_size, uint8 *p, const void *_mesg)
     assert(f);
     assert(mesg);
     assert(mesg->ndims > 0 && mesg->ndims <= H5O_LAYOUT_NDIMS);
-    assert(raw_size == H5O_layout_size(f, _mesg));
+    assert(raw_size == H5O_ALIGN (H5O_layout_size(f, _mesg)));
     assert(p);
 
     /* data or B-tree address */
@@ -161,7 +160,7 @@ H5O_layout_encode(H5F_t *f, size_t raw_size, uint8 *p, const void *_mesg)
  *
  *-------------------------------------------------------------------------
  */
-static void            *
+static void *
 H5O_layout_copy(const void *_mesg, void *_dest)
 {
     const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
@@ -171,8 +170,7 @@ H5O_layout_copy(const void *_mesg, void *_dest)
 
     /* check args */
     assert(mesg);
-    if (!dest)
-        dest = H5MM_xcalloc(1, sizeof(H5O_layout_t));
+    if (!dest) dest = H5MM_xcalloc(1, sizeof(H5O_layout_t));
 
     /* copy */
     *dest = *mesg;