diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-12 01:39:05 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-12 01:39:05 (GMT) |
| commit | 7dc66a568566bd47d09a47f8e77c716d8dd792e1 (patch) | |
| tree | 735ba719918fd411995ee7e3e0eba54e161a16f6 /src/H5F.c | |
| parent | 1f34be9bba199eab8a21b14db0f5d8a7f7cc9ea8 (diff) | |
| download | hdf5-7dc66a568566bd47d09a47f8e77c716d8dd792e1.zip hdf5-7dc66a568566bd47d09a47f8e77c716d8dd792e1.tar.gz hdf5-7dc66a568566bd47d09a47f8e77c716d8dd792e1.tar.bz2 | |
[svn-r17336] Description:
Bring more changes from the file_free_space branch into the trunk.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5F.c')
| -rw-r--r-- | src/H5F.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2970,9 +2970,8 @@ H5Fget_info(hid_t obj_id, H5F_info_t *finfo) HDmemset(finfo, 0, sizeof(H5F_info_t)); /* Check for superblock extension info */ - if(H5F_addr_defined(f->shared->extension_addr)) - if(H5F_super_ext_size(f, H5AC_ind_dxpl_id, &finfo->super_ext_size) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "Unable to retrieve superblock extension size") + if(H5F_super_size(f, H5AC_ind_dxpl_id, NULL, &finfo->super_ext_size) < 0) + HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "Unable to retrieve superblock sizes") /* Check for SOHM info */ if(H5F_addr_defined(f->shared->sohm_addr)) |