diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 17:05:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 17:05:23 (GMT) |
| commit | 90c94ab5d7e86b7573d3d92cf11b14e4fd90dab8 (patch) | |
| tree | b2f7787df09c5f036ba1f90a2283ad0c9dcaa179 /src/H5Fprivate.h | |
| parent | e3abb6e11a2dba5e57e1b36b9b4303a0007a5311 (diff) | |
| download | hdf5-90c94ab5d7e86b7573d3d92cf11b14e4fd90dab8.zip hdf5-90c94ab5d7e86b7573d3d92cf11b14e4fd90dab8.tar.gz hdf5-90c94ab5d7e86b7573d3d92cf11b14e4fd90dab8.tar.bz2 | |
[svn-r17944] Description:
Bring r17943 from trunk to 1.8 branch:
Finish refactoring v2 B-trees so that they can have client callback
context provided to the encode/decode callbacks.
Tested on:
FreeBSD/64 6.3 (liberty)
(h5committested on trunk)
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 6b086f3..c513d55 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -300,20 +300,24 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t; case 2: UINT16DECODE(p, o); break; \ } -#define H5F_ENCODE_LENGTH(f,p,l) switch(H5F_SIZEOF_SIZE(f)) { \ +#define H5F_ENCODE_LENGTH_LEN(p,l,s) switch(s) { \ case 4: UINT32ENCODE(p,l); break; \ case 8: UINT64ENCODE(p,l); break; \ case 2: UINT16ENCODE(p,l); break; \ default: HDassert("bad sizeof size" && 0); \ } -#define H5F_DECODE_LENGTH(f,p,l) switch(H5F_SIZEOF_SIZE(f)) { \ +#define H5F_ENCODE_LENGTH(f,p,l) H5F_ENCODE_LENGTH_LEN(p,l,H5F_SIZEOF_SIZE(f)) + +#define H5F_DECODE_LENGTH_LEN(p,l,s) switch(s) { \ case 4: UINT32DECODE(p,l); break; \ case 8: UINT64DECODE(p,l); break; \ case 2: UINT16DECODE(p,l); break; \ default: HDassert("bad sizeof size" && 0); \ } +#define H5F_DECODE_LENGTH(f,p,l) H5F_DECODE_LENGTH_LEN(p,l,H5F_SIZEOF_SIZE(f)) + /* * Macros that check for overflows. These are somewhat dangerous to fiddle * with. |