diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-04-14 04:49:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-04-14 04:49:26 (GMT) |
| commit | 32aed76605ffaf1c46f91526ce195ca40c0aadc8 (patch) | |
| tree | 65d705e343698bbed7920cf7f8e2bbbbc739905c /src | |
| parent | f37cc250264ad00bb69e454676f8bc81fd454d40 (diff) | |
| download | hdf5-32aed76605ffaf1c46f91526ce195ca40c0aadc8.zip hdf5-32aed76605ffaf1c46f91526ce195ca40c0aadc8.tar.gz hdf5-32aed76605ffaf1c46f91526ce195ca40c0aadc8.tar.bz2 | |
[svn-r6654] Purpose:
Code cleanup
Description:
Stop using hard-coded constant for the initial size of the root group's
symbol table local heap and use macro.
Also, changed existing (unused) macro for the initial heap size to be the
same as the hard-coded constant.
Platforms tested:
FreeBSD 4.8 (sleipnir) w/C++
Linux 2.4 (burrwhite) w/FORTRAN
Solaris 2.7 (arabica) w/FORTRAN
IRIX64 6.5 (modi4) w/parallel & FORTRAN
(h5committest not run due to my ongoing difficulties with C++ on burrwhite).
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5G.c | 6 | ||||
| -rw-r--r-- | src/H5Gpkg.h | 4 |
2 files changed, 4 insertions, 6 deletions
@@ -1550,7 +1550,7 @@ H5G_mkroot (H5F_t *f, hid_t dxpl_id, H5G_entry_t *ent) if (!ent) { ent = &new_root; HDmemset(ent, 0, sizeof(H5G_entry_t)); - if (H5G_stab_create (f, dxpl_id, 256, ent/*out*/)<0) + if (H5G_stab_create (f, dxpl_id, H5G_SIZE_HINT, ent/*out*/)<0) HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to create root group"); if (1 != H5O_link (ent, 1, dxpl_id)) HGOTO_ERROR (H5E_SYM, H5E_LINK, FAIL, "internal error (wrong link count)"); @@ -2768,13 +2768,13 @@ H5G_unlink(H5G_entry_t *loc, const char *name, hid_t dxpl_id) /* Remove the name from the symbol table */ if (H5G_stab_remove(&grp_ent, base, dxpl_id)<0) - HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to unlink name from symbol table"); + HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to unlink name from symbol table"); /* Search the open IDs and replace names for unlinked object */ name_r=H5RS_wrap(name); assert(name_r); if (H5G_replace_name(statbuf.type, &obj_ent, name_r, NULL, NULL, NULL, OP_UNLINK )<0) - HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to replace name"); + HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to replace name"); H5RS_decr(name_r); done: diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index 6c4cf71..5f9adfb 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -31,11 +31,9 @@ #include "H5Gprivate.h" #define H5G_NODE_VERS 1 /*symbol table node version number */ -#define H5G_SIZE_HINT 1024 /*default root grp size hint */ +#define H5G_SIZE_HINT 256 /*default root grp size hint */ #define H5G_NODE_SIZEOF_HDR(F) (H5G_NODE_SIZEOF_MAGIC + 4) -#define H5G_DEFAULT_ROOT_SIZE 32 - /* * A symbol table node is a collection of symbol table entries. It can * be thought of as the lowest level of the B-link tree that points to |