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/H5FSpkg.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/H5FSpkg.h')
| -rw-r--r-- | src/H5FSpkg.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h index 9119902..9f3409f 100644 --- a/src/H5FSpkg.h +++ b/src/H5FSpkg.h @@ -42,19 +42,12 @@ /* Package Private Macros */ /**************************/ -/* Size of signature information (on disk) */ -#define H5FS_SIZEOF_MAGIC 4 - -/* Free space signatures */ -#define H5FS_HDR_MAGIC "FSHD" /* Header */ -#define H5FS_SINFO_MAGIC "FSSE" /* Serialized sections */ - /* Size of checksum information (on disk) */ #define H5FS_SIZEOF_CHKSUM 4 /* "Standard" size of prefix information for free space metadata */ #define H5FS_METADATA_PREFIX_SIZE ( \ - H5FS_SIZEOF_MAGIC /* Signature */ \ + H5_SIZEOF_MAGIC /* Signature */ \ + 1 /* Version */ \ + H5FS_SIZEOF_CHKSUM /* Metadata checksum */ \ ) @@ -208,12 +201,6 @@ H5_DLL H5FS_t *H5FS_new(size_t nclasses, const H5FS_section_class_t *classes[], /* Free space section routines */ H5_DLL H5FS_sinfo_t *H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace); -/* Debugging routines for dumping file structures */ -H5_DLL herr_t H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, - FILE *stream, int indent, int fwidth); -H5_DLL herr_t H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, - FILE *stream, int indent, int fwidth, haddr_t fs_addr, haddr_t client_addr); - /* Metadata cache callbacks */ H5_DLL herr_t H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *hdr); H5_DLL herr_t H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo); |