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/H5HFpkg.h | |
| 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/H5HFpkg.h')
| -rw-r--r-- | src/H5HFpkg.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h index fd332e5..71691c9 100644 --- a/src/H5HFpkg.h +++ b/src/H5HFpkg.h @@ -35,27 +35,19 @@ #include "H5ACprivate.h" /* Metadata cache */ #include "H5B2private.h" /* v2 B-trees */ #include "H5FLprivate.h" /* Free Lists */ -#include "H5FSprivate.h" /* File free space */ +#include "H5FSprivate.h" /* Free space manager */ #include "H5SLprivate.h" /* Skip lists */ /**************************/ /* Package Private Macros */ /**************************/ -/* Size of signature information (on disk) */ -#define H5HF_SIZEOF_MAGIC 4 - -/* Fractal heap signatures */ -#define H5HF_HDR_MAGIC "FRHP" /* Header */ -#define H5HF_IBLOCK_MAGIC "FHIB" /* Indirect block */ -#define H5HF_DBLOCK_MAGIC "FHDB" /* Direct block */ - /* Size of checksum information (on disk) */ #define H5HF_SIZEOF_CHKSUM 4 /* "Standard" size of prefix information for fractal heap metadata */ #define H5HF_METADATA_PREFIX_SIZE(c) ( \ - H5HF_SIZEOF_MAGIC /* Signature */ \ + H5_SIZEOF_MAGIC /* Signature */ \ + 1 /* Version */ \ + ((c) ? H5HF_SIZEOF_CHKSUM : 0) /* Metadata checksum */ \ ) |