diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-02-27 15:57:04 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-02-27 15:57:04 (GMT) |
| commit | 552bb205b9ff9ba43e91d81e9ecc69357b3b0cf3 (patch) | |
| tree | 058641ddf724b39f14285b5dce3a482ba2438012 /src/H5Pfcpl.c | |
| parent | 71285e804fbd7cd1d46b45a77f5ed3ed6f6e9360 (diff) | |
| download | hdf5-552bb205b9ff9ba43e91d81e9ecc69357b3b0cf3.zip hdf5-552bb205b9ff9ba43e91d81e9ecc69357b3b0cf3.tar.gz hdf5-552bb205b9ff9ba43e91d81e9ecc69357b3b0cf3.tar.bz2 | |
[svn-r13413] Description:
Further cleanups to superblock code:
- Move most of the ISOHM-specific code into the H5SM module
- Make only one checksum, for combined superblock & driver info
block
Minor other cleanups, etc.
Tested on:
Mac OS X/32 10.4.8 (amazon)
FreeBSD/32 6.2 (duty)
Diffstat (limited to 'src/H5Pfcpl.c')
| -rw-r--r-- | src/H5Pfcpl.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index 9ab78f8..e093f19 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -228,7 +228,6 @@ done: * Purpose: Retrieves version information for various parts of a file. * * SUPER: The file super block. - * HEAP: The global heap. * FREELIST: The global free list. * STAB: The root symbol table entry. * SHHDR: Shared object headers. @@ -244,44 +243,39 @@ done: * Programmer: Robb Matzke * Wednesday, January 7, 1998 * - * Modifications: - * - * Raymond Lu, Oct 14, 2001 - * Change to the new generic property list. - * *------------------------------------------------------------------------- */ herr_t H5Pget_version(hid_t plist_id, unsigned *super/*out*/, unsigned *freelist/*out*/, - unsigned *stab/*out*/, unsigned *shhdr/*out*/) + unsigned *stab/*out*/, unsigned *shhdr/*out*/) { H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Pget_version, FAIL); + FUNC_ENTER_API(H5Pget_version, FAIL) H5TRACE5("e", "ixxxx", plist_id, super, freelist, stab, shhdr); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* Get values */ - if (super) + if(super) if(H5P_get(plist, H5F_CRT_SUPER_VERS_NAME, super) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get superblock version"); - if (freelist) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get superblock version") + if(freelist) if(H5P_get(plist, H5F_CRT_FREESPACE_VERS_NAME, freelist) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get free-space version"); - if (stab) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get free-space version") + if(stab) if(H5P_get(plist, H5F_CRT_OBJ_DIR_VERS_NAME, stab) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object directory version"); - if (shhdr) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object directory version") + if(shhdr) if(H5P_get(plist, H5F_CRT_SHARE_HEAD_VERS_NAME, shhdr) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get shared-header version"); + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get shared-header version") done: - FUNC_LEAVE_API(ret_value); -} + FUNC_LEAVE_API(ret_value) +} /* end H5Pget_version() */ /*------------------------------------------------------------------------- |