summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-08-22 17:20:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-08-22 17:20:49 (GMT)
commitc2c6e2d0d5f4bfe8c7d31711a09b0bc1cdcd267f (patch)
tree93bc07ecea039f958a40b14715959b79740c9c31 /src
parentdfd71ce12683526f1fdb6abeb43d4a1a107cfe49 (diff)
downloadhdf5-c2c6e2d0d5f4bfe8c7d31711a09b0bc1cdcd267f.zip
hdf5-c2c6e2d0d5f4bfe8c7d31711a09b0bc1cdcd267f.tar.gz
hdf5-c2c6e2d0d5f4bfe8c7d31711a09b0bc1cdcd267f.tar.bz2
[svn-r12611] Description:
Remove unused flag byte from fractal heap metadata on disk. Tested on: Linux/32 2.6 (chicago) Linux/64 2.6 (chicago2)
Diffstat (limited to 'src')
-rw-r--r--src/H5HFcache.c27
-rw-r--r--src/H5HFpkg.h1
2 files changed, 0 insertions, 28 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 2f3a78e..ddf8e0c 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -300,11 +300,6 @@ HDfprintf(stderr, "%s: Load heap header, addr = %a\n", FUNC, addr);
if(*p++ != H5HF_HDR_VERSION)
HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap header version")
- /* Metadata flags (unused, currently) */
-/* XXX: Plan out metadata flags (including "read-only duplicate" feature) */
- if(*p++ != 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unknown metadata flag in fractal heap header")
-
/* General heap information */
UINT16DECODE(p, hdr->id_len); /* Heap ID length */
UINT16DECODE(p, hdr->filter_len); /* I/O filters' encoded length */
@@ -481,10 +476,6 @@ HDfprintf(stderr, "%s: Flushing heap header, addr = %a, destroy = %u\n", FUNC, a
/* Version # */
*p++ = H5HF_HDR_VERSION;
- /* Metadata status flags */
-/* XXX: Set this? */
- *p++ = 0;
-
/* General heap information */
UINT16ENCODE(p, hdr->id_len); /* Heap ID length */
UINT16ENCODE(p, hdr->filter_len); /* I/O filters' encoded length */
@@ -749,11 +740,6 @@ HDfprintf(stderr, "%s: Load indirect block, addr = %a\n", FUNC, addr);
if(*p++ != H5HF_IBLOCK_VERSION)
HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap direct block version")
- /* Metadata flags (unused, currently) */
-/* XXX: Plan out metadata flags (including "read-only duplicate" feature) */
- if(*p++ != 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unknown metadata flag in fractal heap direct block")
-
/* Address of heap that owns this block */
H5F_addr_decode(f, &p, &heap_addr);
if(H5F_addr_ne(heap_addr, hdr->heap_addr))
@@ -937,10 +923,6 @@ HDfprintf(stderr, "%s: hdr->man_dtable.cparam.width = %u\n", FUNC, hdr->man_dtab
/* Version # */
*p++ = H5HF_IBLOCK_VERSION;
- /* Metadata status flags */
-/* XXX: Set this? */
- *p++ = 0;
-
/* Address of heap header for heap which owns this block */
H5F_addr_encode(f, &p, hdr->heap_addr);
@@ -1223,11 +1205,6 @@ HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, NULL, "I/O filters not supported yet")
if(*p++ != H5HF_DBLOCK_VERSION)
HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong fractal heap direct block version")
- /* Metadata flags (unused, currently) */
-/* XXX: Plan out metadata flags (including "read-only duplicate" feature) */
- if(*p++ != 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unknown metadata flag in fractal heap direct block")
-
/* Address of heap that owns this block (just for file integrity checks) */
H5F_addr_decode(f, &p, &heap_addr);
if(H5F_addr_ne(heap_addr, hdr->heap_addr))
@@ -1323,10 +1300,6 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
/* Version # */
*p++ = H5HF_DBLOCK_VERSION;
- /* Metadata status flags */
-/* XXX: Set this? */
- *p++ = 0;
-
/* Address of heap header for heap which owns this block */
H5F_addr_encode(f, &p, hdr->heap_addr);
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 14a9baa..9415281 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -56,7 +56,6 @@
#define H5HF_METADATA_PREFIX_SIZE(c) ( \
4 /* Signature */ \
+ 1 /* Version */ \
- + 1 /* Metadata flags */ \
+ ((c) ? H5HF_SIZEOF_CHKSUM : 0) /* Metadata checksum */ \
)