diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-16 20:28:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-16 20:28:44 (GMT) |
| commit | 43995f12ac694455b3ca42292eb8cea15c08817e (patch) | |
| tree | aec930ca82315c1dec81579aff20bc12c1db67db /src/H5G.c | |
| parent | 0f43d84b3c7292bfb7d51218f02738028f818ff0 (diff) | |
| download | hdf5-43995f12ac694455b3ca42292eb8cea15c08817e.zip hdf5-43995f12ac694455b3ca42292eb8cea15c08817e.tar.gz hdf5-43995f12ac694455b3ca42292eb8cea15c08817e.tar.bz2 | |
[svn-r22583] Description:
Bring r22582 from trunk to 1.8 branch:
Refactor ID class registration to be more like how other "class"s in the
library are registered, and clean up compiler warnings.
Tested on:
Mac OSX/64 10.7.4 (amazon) w/debug
(Too minor to require h5comittest)
Diffstat (limited to 'src/H5G.c')
| -rw-r--r-- | src/H5G.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -100,8 +100,6 @@ /* Local Macros */ /****************/ -#define H5G_RESERVED_ATOMS 0 - /******************/ /* Local Typedefs */ @@ -132,6 +130,15 @@ /* Local Variables */ /*******************/ +/* Group ID class */ +static const H5I_class_t H5I_GROUP_CLS[1] = {{ + H5I_GROUP, /* ID class value */ + 0, /* Class flags */ + 64, /* Minimum hash size for class */ + 0, /* # of reserved IDs for class */ + (H5I_free_t)H5G_close /* Callback routine for closing objects of this class */ +}}; + /*------------------------------------------------------------------------- @@ -187,7 +194,7 @@ H5G_init_interface(void) FUNC_ENTER_NOAPI_NOINIT /* Initialize the atom group for the group IDs */ - if(H5I_register_type(H5I_GROUP, (size_t)H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, (H5I_free_t)H5G_close) < 0) + if(H5I_register_type(H5I_GROUP_CLS) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface") done: |