diff options
author | Albert Cheng <acheng@hdfgroup.org> | 1998-02-09 19:37:40 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 1998-02-09 19:37:40 (GMT) |
commit | 7e8e3eec42254a6988b2739b621b1412963d590c (patch) | |
tree | cc7d01adda3675d67d35c8cb2edaf7a1dc469f40 /src/H5Ostab.c | |
parent | 35e7a062e26c1a65e571202a6fda0b475e42da00 (diff) | |
download | hdf5-7e8e3eec42254a6988b2739b621b1412963d590c.zip hdf5-7e8e3eec42254a6988b2739b621b1412963d590c.tar.gz hdf5-7e8e3eec42254a6988b2739b621b1412963d590c.tar.bz2 |
[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.
Diffstat (limited to 'src/H5Ostab.c')
-rw-r--r-- | src/H5Ostab.c | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/src/H5Ostab.c b/src/H5Ostab.c index e1a5d0a..7600f47 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -23,31 +23,29 @@ #define PABLO_MASK H5O_stab_mask /* PRIVATE PROTOTYPES */ -static void *H5O_stab_decode(H5F_t *f, size_t raw_size, const uint8 *p); -static herr_t H5O_stab_encode(H5F_t *f, size_t size, uint8 *p, - const void *_mesg); -static void *H5O_stab_copy(const void *_mesg, void *_dest); -static size_t H5O_stab_size(H5F_t *f, const void *_mesg); -static herr_t H5O_stab_debug(H5F_t *f, const void *_mesg, - FILE * stream, intn indent, intn fwidth); +static void *H5O_stab_decode(H5F_t *f, size_t raw_size, const uint8 *p); +static herr_t H5O_stab_encode(H5F_t *f, size_t size, uint8 *p, + const void *_mesg); +static void *H5O_stab_copy(const void *_mesg, void *_dest); +static size_t H5O_stab_size(H5F_t *f, const void *_mesg); +static herr_t H5O_stab_debug(H5F_t *f, const void *_mesg, + FILE * stream, intn indent, intn fwidth); /* This message derives from H5O */ -const H5O_class_t H5O_STAB[1] = -{ - { - H5O_STAB_ID, /*message id number */ - "stab", /*message name for debugging */ - sizeof(H5O_stab_t), /*native message size */ - H5O_stab_decode, /*decode message */ - H5O_stab_encode, /*encode message */ - H5O_stab_copy, /*copy the native value */ - H5O_stab_size, /*size of symbol table entry */ - NULL, /*default reset method */ - H5O_stab_debug, /*debug the message */ - }}; +const H5O_class_t H5O_STAB[1] = {{ + H5O_STAB_ID, /*message id number */ + "stab", /*message name for debugging */ + sizeof(H5O_stab_t), /*native message size */ + H5O_stab_decode, /*decode message */ + H5O_stab_encode, /*encode message */ + H5O_stab_copy, /*copy the native value */ + H5O_stab_size, /*size of symbol table entry */ + NULL, /*default reset method */ + H5O_stab_debug, /*debug the message */ +}}; /* Interface initialization */ -static hbool_t interface_initialize_g = FALSE; +static hbool_t interface_initialize_g = FALSE; #define INTERFACE_INIT NULL /*------------------------------------------------------------------------- @@ -68,7 +66,7 @@ static hbool_t interface_initialize_g = FALSE; * *------------------------------------------------------------------------- */ -static void * +static void * H5O_stab_decode(H5F_t *f, size_t raw_size, const uint8 *p) { H5O_stab_t *stab; @@ -77,7 +75,7 @@ H5O_stab_decode(H5F_t *f, size_t raw_size, const uint8 *p) /* check args */ assert(f); - assert(raw_size == 2 * H5F_SIZEOF_ADDR(f)); + assert(raw_size == H5O_ALIGN (2 * H5F_SIZEOF_ADDR(f))); assert(p); /* decode */ @@ -114,7 +112,7 @@ H5O_stab_encode(H5F_t *f, size_t raw_size, uint8 *p, const void *_mesg) /* check args */ assert(f); - assert(raw_size == 2 * H5F_SIZEOF_ADDR(f)); + assert(raw_size == H5O_ALIGN (2 * H5F_SIZEOF_ADDR(f))); assert(p); assert(stab); @@ -144,7 +142,7 @@ H5O_stab_encode(H5F_t *f, size_t raw_size, uint8 *p, const void *_mesg) * *------------------------------------------------------------------------- */ -void * +void * H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg) { H5O_stab_t *stab = NULL; @@ -156,10 +154,8 @@ H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg) assert(type); if (H5O_STAB == type) { - if (_mesg) - stab = (H5O_stab_t *) _mesg; - else - stab = H5MM_xcalloc(1, sizeof(H5O_stab_t)); + if (_mesg) stab = (H5O_stab_t *) _mesg; + else stab = H5MM_xcalloc(1, sizeof(H5O_stab_t)); stab->btree_addr = cache->stab.btree_addr; stab->heap_addr = cache->stab.heap_addr; } @@ -184,7 +180,7 @@ H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg) * *------------------------------------------------------------------------- */ -static void * +static void * H5O_stab_copy(const void *_mesg, void *_dest) { const H5O_stab_t *stab = (const H5O_stab_t *) _mesg; |