From 6742cba5720839693780c247d55deee62a3bee51 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 31 Aug 2010 14:21:59 -0500 Subject: [svn-r19322] Description: Misc. minor formatting issues, etc. Tested on: Mac OS X/32 10.6.4 (amazon) w/debug (h5committest not required on this branch) --- src/H5EA.c | 4 ---- src/H5EAcache.c | 19 ------------------- src/H5EAdbg.c | 13 ------------- src/H5EApkg.h | 2 -- src/H5EAtest.c | 2 +- src/H5FAcache.c | 6 ------ src/H5FApkg.h | 7 ++++++- tools/misc/h5debug.c | 9 --------- 8 files changed, 7 insertions(+), 55 deletions(-) diff --git a/src/H5EA.c b/src/H5EA.c index af2ffbb..7f2bb77 100644 --- a/src/H5EA.c +++ b/src/H5EA.c @@ -84,10 +84,6 @@ typedef herr_t (*H5EA__unprotect_func_t)(void *thing, hid_t dxpl_id, /* Remember to add client ID to H5EA_cls_id_t in H5EAprivate.h when adding a new * client class.. */ -extern const H5EA_class_t H5EA_CLS_CHUNK[1]; -extern const H5EA_class_t H5EA_CLS_FILT_CHUNK[1]; -extern const H5EA_class_t H5EA_CLS_TEST[1]; - const H5EA_class_t *const H5EA_client_class_g[] = { H5EA_CLS_CHUNK, /* 0 - H5EA_CLS_CHUNK_ID */ H5EA_CLS_FILT_CHUNK, /* 1 - H5EA_CLS_FILT_CHUNK_ID */ diff --git a/src/H5EAcache.c b/src/H5EAcache.c index cc712ab9..e45224d 100644 --- a/src/H5EAcache.c +++ b/src/H5EAcache.c @@ -560,10 +560,6 @@ END_FUNC(STATIC) /* end H5EA__cache_hdr_dest() */ * koziol@hdfgroup.org * Sep 9 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. - *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, @@ -704,9 +700,6 @@ END_FUNC(STATIC) /* end H5EA__cache_iblock_load() */ * koziol@hdfgroup.org * Sep 9 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, @@ -985,9 +978,6 @@ END_FUNC(STATIC) /* end H5EA__cache_iblock_dest() */ * koziol@hdfgroup.org * Sep 30 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, @@ -1119,9 +1109,6 @@ END_FUNC(STATIC) /* end H5EA__cache_sblock_load() */ * koziol@hdfgroup.org * Sep 30 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, @@ -1390,9 +1377,6 @@ END_FUNC(STATIC) /* end H5EA__cache_sblock_dest() */ * koziol@hdfgroup.org * Sep 16 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, @@ -1522,9 +1506,6 @@ END_FUNC(STATIC) /* end H5EA__cache_dblock_load() */ * koziol@hdfgroup.org * Sep 18 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c index 32b0307..b9a5bad 100644 --- a/src/H5EAdbg.c +++ b/src/H5EAdbg.c @@ -91,9 +91,6 @@ * koziol@hdfgroup.org * Sep 11 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Create debugging context so that header can be loaded properly. *------------------------------------------------------------------------- */ BEGIN_FUNC(PKG, ERR, @@ -174,7 +171,6 @@ H5EA__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, CATCH if(dbg_ctx && cls->dst_dbg_ctx(dbg_ctx) < 0) H5E_THROW(H5E_CANTRELEASE, "unable to release extensible array debugging context") - if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_EARRAY_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0) H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array header") @@ -192,9 +188,6 @@ END_FUNC(PKG) /* end H5EA__hdr_debug() */ * koziol@hdfgroup.org * Sep 11 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Create debugging context so that header can be loaded properly. *------------------------------------------------------------------------- */ BEGIN_FUNC(PKG, ERR, @@ -320,9 +313,6 @@ END_FUNC(PKG) /* end H5EA__iblock_debug() */ * koziol@hdfgroup.org * Sep 30 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Create debugging context so that header can be loaded properly. *------------------------------------------------------------------------- */ BEGIN_FUNC(PKG, ERR, @@ -415,9 +405,6 @@ END_FUNC(PKG) /* end H5EA__sblock_debug() */ * koziol@hdfgroup.org * Sep 22 2008 * - * Modifications: - * Vailin Choi; July 2010 - * Create debugging context so that header can be loaded properly. *------------------------------------------------------------------------- */ BEGIN_FUNC(PKG, ERR, diff --git a/src/H5EApkg.h b/src/H5EApkg.h index 0bbca28..8545ef8 100644 --- a/src/H5EApkg.h +++ b/src/H5EApkg.h @@ -356,9 +356,7 @@ H5_DLLVAR const H5EA_class_t H5EA_CLS_CHUNK[1]; H5_DLLVAR const H5EA_class_t H5EA_CLS_FILT_CHUNK[1]; /* Internal extensible array testing class */ -#ifdef H5EA_TESTING H5_DLLVAR const H5EA_class_t H5EA_CLS_TEST[1]; -#endif /* H5EA_TESTING */ /* Array of extensible array client ID -> client class mappings */ extern const H5EA_class_t *const H5EA_client_class_g[H5EA_NUM_CLS_ID]; diff --git a/src/H5EAtest.c b/src/H5EAtest.c index e24fc65..acf4863 100644 --- a/src/H5EAtest.c +++ b/src/H5EAtest.c @@ -79,7 +79,6 @@ static herr_t H5EA__test_encode(void *raw, const void *elmt, size_t nelmts, void static herr_t H5EA__test_decode(const void *raw, void *elmt, size_t nelmts, void *ctx); static herr_t H5EA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt); static void *H5EA__test_crt_dbg_context(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED obj_addr); - static herr_t H5EA__test_dst_dbg_context(void *_ctx); /*********************/ @@ -113,6 +112,7 @@ const H5EA_class_t H5EA_CLS_TEST[1]={{ /* Declare a free list to manage the H5EA__test_ctx_t struct */ H5FL_DEFINE_STATIC(H5EA__test_ctx_t); + /* Declare a free list to manage the H5EA__ctx_cb_t struct */ H5FL_DEFINE_STATIC(H5EA__ctx_cb_t); diff --git a/src/H5FAcache.c b/src/H5FAcache.c index 7e72a08..14df4c8 100644 --- a/src/H5FAcache.c +++ b/src/H5FAcache.c @@ -496,9 +496,6 @@ END_FUNC(STATIC) /* end H5FA__cache_hdr_dest() */ * Programmer: Vailin Choi * Thursday, April 30, 2009 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, @@ -628,9 +625,6 @@ END_FUNC(STATIC) /* end H5FA__cache_dblock_load() */ * Programmer: Vailin Choi * Thursday, April 30, 2009 * - * Modifications: - * Vailin Choi; July 2010 - * Moved Fixed array type to be right after MAGIC # and version. *------------------------------------------------------------------------- */ BEGIN_FUNC(STATIC, ERR, diff --git a/src/H5FApkg.h b/src/H5FApkg.h index 3df1cda..d0093a6 100644 --- a/src/H5FApkg.h +++ b/src/H5FApkg.h @@ -73,11 +73,14 @@ #define H5FA_HEADER_SIZE(h) ( \ /* General metadata fields */ \ H5FA_METADATA_PREFIX_SIZE(TRUE) \ + \ /* General array information */ \ + 1 /* Element Size */ \ + 1 /* Log2(Max. # of elements in data block page) - i.e. # of bits needed to store max. # of elements in data block page */ \ + \ /* Fixed Array statistics fields */ \ + (h)->sizeof_size /* # of elements in the fixed array */ \ + \ /* Fixed Array Header specific fields */ \ + (h)->sizeof_addr /* File address of Fixed Array data block */ \ ) @@ -86,8 +89,10 @@ #define H5FA_DBLOCK_PREFIX_SIZE(d) ( \ /* General metadata fields */ \ H5FA_METADATA_PREFIX_SIZE(TRUE) \ + \ /* Sanity-checking fields */ \ + (d)->hdr->sizeof_addr /* File address of Fixed Array header owning the data block */ \ + \ /* Fixed Array Data Block specific fields */ \ + (d)->dblk_page_init_size /* Fixed array data block 'page init' bitmasks (can be 0 if no pages) */ \ ) @@ -96,6 +101,7 @@ #define H5FA_DBLOCK_SIZE(d) ( \ /* Data block prefix size */ \ H5FA_DBLOCK_PREFIX_SIZE(d) \ + \ /* Fixed Array Elements|Pages of Elements*/ \ + ((d)->hdr->cparam.nelmts * (size_t)(d)->hdr->cparam.raw_elmt_size) \ + ((d)->npages * H5FA_SIZEOF_CHKSUM) /* Checksum */ \ @@ -216,7 +222,6 @@ H5_DLLVAR const H5AC_class_t H5AC_FARRAY_DBLOCK[1]; /* H5FA data block page inherits cache-like properties from H5AC */ H5_DLLVAR const H5AC_class_t H5AC_FARRAY_DBLK_PAGE[1]; - /* The Fixed Array class for dataset chunks w/o filters*/ H5_DLLVAR const H5FA_class_t H5FA_CLS_CHUNK[1]; diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index ef43adb..50d81d0 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -21,8 +21,6 @@ * * Purpose: Debugs an existing HDF5 file at a low level. * - * Modifications: - * *------------------------------------------------------------------------- */ #define H5A_PACKAGE /*suppress error about including H5Apkg */ @@ -144,10 +142,6 @@ get_H5B2_class(const uint8_t *sig) * koziol@hdfgroup.org * Sep 11 2008 * - * Modifications: - * Vailin Choi; August 2010 - * Added Extensible Array class callbacks. - * *------------------------------------------------------------------------- */ static const H5EA_class_t * @@ -234,9 +228,6 @@ get_H5FA_class(const uint8_t *sig) * matzke@llnl.gov * Jul 18 1997 * - * Modifications: - * Vailin Choi; August 2010 - * Modified to handle Extensible Array and Fixed Array meta data. *------------------------------------------------------------------------- */ int -- cgit v0.12