diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-10 13:13:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-10 13:13:22 (GMT) |
| commit | 5474e06434a513be2260933f1e4ab5159361f2e8 (patch) | |
| tree | e3d71aa777bd079055876705e44fd154e012d158 /src | |
| parent | 3da4c37539f31501f18f6be9b8d4afeb5ebdee49 (diff) | |
| download | hdf5-5474e06434a513be2260933f1e4ab5159361f2e8.zip hdf5-5474e06434a513be2260933f1e4ab5159361f2e8.tar.gz hdf5-5474e06434a513be2260933f1e4ab5159361f2e8.tar.bz2 | |
[svn-r7197] Purpose:
Code cleanup
Description:
Add version number checking to local heap code.
Platforms tested:
FreeBSD 4.8 (sleipnir)
too small to need h5committest
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5HL.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -52,6 +52,11 @@ H5F_SIZEOF_SIZE (F) + /*free list head */ \ H5F_SIZEOF_ADDR (F)) /*data address */ +/* + * Local heap collection version. + */ +#define H5HL_VERSION 0 + /* Private typedefs */ typedef struct H5HL_free_t { size_t offset; /*offset of free block */ @@ -258,8 +263,12 @@ H5HL_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED * udata1, HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap signature"); p += H5HL_SIZEOF_MAGIC; + /* Version */ + if (H5HL_VERSION!=*p++) + HGOTO_ERROR (H5E_HEAP, H5E_CANTLOAD, NULL, "wrong version number in global heap"); + /* Reserved */ - p += 4; + p += 3; /* Allocate space in memory for the heap */ if (NULL==(heap = H5FL_CALLOC(H5HL_t))) @@ -465,7 +474,7 @@ H5HL_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HL_t *heap) fl=heap->freelist; HDmemcpy(p, H5HL_MAGIC, H5HL_SIZEOF_MAGIC); p += H5HL_SIZEOF_MAGIC; - *p++ = 0; /*reserved*/ + *p++ = H5HL_VERSION; *p++ = 0; /*reserved*/ *p++ = 0; /*reserved*/ *p++ = 0; /*reserved*/ |