diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-06 19:23:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 19:23:59 (GMT) |
| commit | 3c05dd74b865135ee7b0dcf0c38d5df85c6d95d8 (patch) | |
| tree | 0ca6fc1d353505daebfe7813d17f05053f52bd9c /src/H5B2test.c | |
| parent | 2384a731763a7ceb11e39d48cc0f6991d908389e (diff) | |
| download | hdf5-3c05dd74b865135ee7b0dcf0c38d5df85c6d95d8.zip hdf5-3c05dd74b865135ee7b0dcf0c38d5df85c6d95d8.tar.gz hdf5-3c05dd74b865135ee7b0dcf0c38d5df85c6d95d8.tar.bz2 | |
Move encode/decode macros to a new header (#3040)
Moves the file-independent encode and decode macros to a new
H5encode.h header that is itself included in H5private.h.
Removes UINT64ENCODE_VARLEN and UINT64DECODE_VARLEN, which
were unused.
Fixes include statements in files where H5VMprivate.h and
H5MMprivate.h were included via H5Fprivate.h.
Diffstat (limited to 'src/H5B2test.c')
| -rw-r--r-- | src/H5B2test.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/H5B2test.c b/src/H5B2test.c index 14ce00d..8b278da 100644 --- a/src/H5B2test.c +++ b/src/H5B2test.c @@ -11,9 +11,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* Programmer: Quincey Koziol - * Thursday, February 3, 2005 * - * Purpose: v2 B-tree testing functions. + * Purpose: v2 B-tree testing functions * */ @@ -27,9 +26,12 @@ /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5B2pkg.h" /* v2 B-trees */ -#include "H5Eprivate.h" /* Error handling */ +#include "H5private.h" /* Generic Functions */ +#include "H5ACprivate.h" /* Metadata Cache */ +#include "H5B2pkg.h" /* B-Trees (Version 2) */ +#include "H5Eprivate.h" /* Error Handling */ +#include "H5Fprivate.h" /* Files */ +#include "H5FLprivate.h" /* Free Lists */ /****************/ /* Local Macros */ @@ -251,7 +253,7 @@ H5B2__test_encode(uint8_t *raw, const void *nrecord, void *_ctx) /* Sanity check */ HDassert(ctx); - H5F_ENCODE_LENGTH_LEN(raw, *(const hsize_t *)nrecord, ctx->sizeof_size); + H5_ENCODE_LENGTH_LEN(raw, *(const hsize_t *)nrecord, ctx->sizeof_size); FUNC_LEAVE_NOAPI(SUCCEED) } /* H5B2__test_encode() */ @@ -279,7 +281,7 @@ H5B2__test_decode(const uint8_t *raw, void *nrecord, void *_ctx) /* Sanity check */ HDassert(ctx); - H5F_DECODE_LENGTH_LEN(raw, *(hsize_t *)nrecord, ctx->sizeof_size); + H5_DECODE_LENGTH_LEN(raw, *(hsize_t *)nrecord, ctx->sizeof_size); FUNC_LEAVE_NOAPI(SUCCEED) } /* H5B2__test_decode() */ @@ -379,8 +381,8 @@ H5B2__test2_encode(uint8_t *raw, const void *nrecord, void *_ctx) /* Sanity check */ HDassert(ctx); - H5F_ENCODE_LENGTH_LEN(raw, ((const H5B2_test_rec_t *)nrecord)->key, ctx->sizeof_size); - H5F_ENCODE_LENGTH_LEN(raw, ((const H5B2_test_rec_t *)nrecord)->val, ctx->sizeof_size); + H5_ENCODE_LENGTH_LEN(raw, ((const H5B2_test_rec_t *)nrecord)->key, ctx->sizeof_size); + H5_ENCODE_LENGTH_LEN(raw, ((const H5B2_test_rec_t *)nrecord)->val, ctx->sizeof_size); FUNC_LEAVE_NOAPI(SUCCEED) } /* H5B2__test2_encode() */ @@ -408,8 +410,8 @@ H5B2__test2_decode(const uint8_t *raw, void *nrecord, void *_ctx) /* Sanity check */ HDassert(ctx); - H5F_DECODE_LENGTH_LEN(raw, ((H5B2_test_rec_t *)nrecord)->key, ctx->sizeof_size); - H5F_DECODE_LENGTH_LEN(raw, ((H5B2_test_rec_t *)nrecord)->val, ctx->sizeof_size); + H5_DECODE_LENGTH_LEN(raw, ((H5B2_test_rec_t *)nrecord)->key, ctx->sizeof_size); + H5_DECODE_LENGTH_LEN(raw, ((H5B2_test_rec_t *)nrecord)->val, ctx->sizeof_size); FUNC_LEAVE_NOAPI(SUCCEED) } /* H5B2__test2_decode() */ |