diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-22 17:33:58 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-22 17:33:58 (GMT) |
commit | 926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8 (patch) | |
tree | ad06b825bd0d4dc30c88ab14dda1abe0c87f4ed5 /src/H5HL.c | |
parent | 531822d443296bfe74a76aed6c121ec8421508a5 (diff) | |
download | hdf5-926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8.zip hdf5-926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8.tar.gz hdf5-926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8.tar.bz2 |
[svn-r15677] Description:
Bring r15676 back from trunk:
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.5 (amazon)
Too minor to require h5committest
Diffstat (limited to 'src/H5HL.c')
-rw-r--r-- | src/H5HL.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -231,9 +231,9 @@ H5HL_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED * udata1, p = hdr; /* Check magic number */ - if(HDmemcmp(hdr, H5HL_MAGIC, (size_t)H5HL_SIZEOF_MAGIC)) + if(HDmemcmp(hdr, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC)) HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap signature") - p += H5HL_SIZEOF_MAGIC; + p += H5_SIZEOF_MAGIC; /* Version */ if(H5HL_VERSION != *p++) @@ -488,8 +488,8 @@ H5HL_serialize(H5F_t *f, H5HL_t *heap, uint8_t *buf) /* serialize the header */ p = buf; fl = heap->freelist; - HDmemcpy(p, H5HL_MAGIC, (size_t)H5HL_SIZEOF_MAGIC); - p += H5HL_SIZEOF_MAGIC; + HDmemcpy(p, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC); + p += H5_SIZEOF_MAGIC; *p++ = H5HL_VERSION; *p++ = 0; /*reserved*/ *p++ = 0; /*reserved*/ |