diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-22 17:13:21 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-22 17:13:21 (GMT) |
| commit | 071e281a3df70893b975d65a3a21f11a47cb43aa (patch) | |
| tree | 3c12a5c093c4410929df792a5e6112858b8d212b /src/H5Gnode.c | |
| parent | 02156246da8fd221b655458771f2b83ee20c9dfe (diff) | |
| download | hdf5-071e281a3df70893b975d65a3a21f11a47cb43aa.zip hdf5-071e281a3df70893b975d65a3a21f11a47cb43aa.tar.gz hdf5-071e281a3df70893b975d65a3a21f11a47cb43aa.tar.bz2 | |
[svn-r15676] Description:
Centralize all macros for declaring "magic numbers"/signatures for
objects in the file into src/H5Fprivate.h, so it's easier to know what values
have already been defined, etc.
Tested on:
Mac OS X/32 10.5.4 (amazon) in debug mode
Mac OS X/32 10.5.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Gnode.c')
| -rw-r--r-- | src/H5Gnode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index a3239c2..cefed5b 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -66,7 +66,7 @@ typedef struct H5G_node_t { /* Private macros */ #define H5G_NODE_VERS 1 /*symbol table node version number */ -#define H5G_NODE_SIZEOF_HDR(F) (H5G_NODE_SIZEOF_MAGIC + 4) +#define H5G_NODE_SIZEOF_HDR(F) (H5_SIZEOF_MAGIC + 4) /* Size of stack buffer for serialized nodes */ #define H5G_NODE_BUF_SIZE 512 @@ -380,9 +380,9 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *_udata1 p = node; /* magic */ - if(HDmemcmp(p, H5G_NODE_MAGIC, (size_t)H5G_NODE_SIZEOF_MAGIC)) + if(HDmemcmp(p, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, NULL, "bad symbol table node signature") - p += 4; + p += H5_SIZEOF_MAGIC; /* version */ if(H5G_NODE_VERS != *p++) @@ -559,8 +559,8 @@ H5G_node_serialize(H5F_t *f, H5G_node_t *sym, size_t size, uint8_t *buf) p = buf; /* magic number */ - HDmemcpy(p, H5G_NODE_MAGIC, (size_t)H5G_NODE_SIZEOF_MAGIC); - p += 4; + HDmemcpy(p, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC); + p += H5_SIZEOF_MAGIC; /* version number */ *p++ = H5G_NODE_VERS; |