diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-04 04:26:12 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-04 04:26:12 (GMT) |
commit | bd7499db1fb2c73352943c2d365c71a8cce7421b (patch) | |
tree | 4d24f041093576319f9357d5714e39398d7b7511 /src/H5G.c | |
parent | 16f45fc25a3b24eab31ac846cde0851179e3d7bf (diff) | |
download | hdf5-bd7499db1fb2c73352943c2d365c71a8cce7421b.zip hdf5-bd7499db1fb2c73352943c2d365c71a8cce7421b.tar.gz hdf5-bd7499db1fb2c73352943c2d365c71a8cce7421b.tar.bz2 |
[svn-r20407] Description:
Bring r20406 from trunk to 1.8 branch:
Refactor root group routines to centralize and simplify them some.
Also patch root group's file pointer when it doesn't match the querying
file, from H5G_rootof.
Tested on:
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5G.c')
-rw-r--r-- | src/H5G.c | 66 |
1 files changed, 0 insertions, 66 deletions
@@ -1211,38 +1211,6 @@ done: /*------------------------------------------------------------------------- - * Function: H5G_free - * - * Purpose: Free memory used by an H5G_t struct (and its H5G_shared_t). - * Does not close the group or decrement the reference count. - * Used to free memory used by the root group. - * - * Return: Success: Non-negative - * Failure: Negative - * - * Programmer: James Laird - * Tuesday, September 7, 2004 - * - *------------------------------------------------------------------------- - */ -herr_t -H5G_free(H5G_t *grp) -{ - herr_t ret_value = SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5G_free, FAIL) - - HDassert(grp && grp->shared); - - grp->shared = H5FL_FREE(H5G_shared_t, grp->shared); - grp = H5FL_FREE(H5G_t, grp); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} /* end H5G_free() */ - - -/*------------------------------------------------------------------------- * Function: H5G_oloc * * Purpose: Returns a pointer to the object location for a group. @@ -1315,40 +1283,6 @@ H5G_fileof(H5G_t *grp) /*------------------------------------------------------------------------- - * Function: H5G_free_grp_name - * - * Purpose: Free the 'ID to name' buffers. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu - * - * Date: August 22, 2002 - * - * Comments: Used now only on the root group close, in H5F_close() - * - *------------------------------------------------------------------------- - */ -herr_t -H5G_free_grp_name(H5G_t *grp) -{ - herr_t ret_value = SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5G_free_grp_name, FAIL) - - /* Check args */ - HDassert(grp && grp->shared); - HDassert(grp->shared->fo_count > 0); - - /* Free the path */ - H5G_name_free(&(grp->path)); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} /* end H5G_free_grp_name() */ - - -/*------------------------------------------------------------------------- * Function: H5G_get_shared_count * * Purpose: Queries the group object's "shared count" |