diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 00:55:45 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 00:55:45 (GMT) |
commit | 7c22743e8eaa5e5d2ffc8b0db7518ed6c5be40ee (patch) | |
tree | e21068d63c94d67084af0dd902a2da902dec03dd /src/H5Dfarray.c | |
parent | 2a07e56c0522aa3ff86005ad923b9bd96c05689e (diff) | |
download | hdf5-7c22743e8eaa5e5d2ffc8b0db7518ed6c5be40ee.zip hdf5-7c22743e8eaa5e5d2ffc8b0db7518ed6c5be40ee.tar.gz hdf5-7c22743e8eaa5e5d2ffc8b0db7518ed6c5be40ee.tar.bz2 |
[svn-r17267] Description:
Bring r17262:17265 from trunk to revise_chunks brach.
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 (jam) 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 debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Dfarray.c')
-rw-r--r-- | src/H5Dfarray.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index f1b3ee1..8bba822 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -630,7 +630,7 @@ H5D_farray_idx_open(const H5D_chk_idx_info_t *idx_info) HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(H5D_CHUNK_IDX_FARRAY == idx_info->layout->u.chunk.idx_type); - HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(NULL == idx_info->layout->u.chunk.u.farray.fa); /* Set up the user data */ @@ -639,7 +639,7 @@ H5D_farray_idx_open(const H5D_chk_idx_info_t *idx_info) /* Open the fixed array for the chunk index */ cls = (idx_info->pline->nused > 0) ? H5FA_CLS_FILT_CHUNK : H5FA_CLS_CHUNK; - if(NULL == (idx_info->layout->u.chunk.u.farray.fa = H5FA_open(idx_info->f, idx_info->dxpl_id, idx_info->layout->store.u.chunk.u.farray.addr, cls, &udata))) + if(NULL == (idx_info->layout->u.chunk.u.farray.fa = H5FA_open(idx_info->f, idx_info->dxpl_id, idx_info->layout->store.u.chunk.idx_addr, cls, &udata))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open fixed array") done: @@ -679,7 +679,7 @@ H5D_farray_idx_create(const H5D_chk_idx_info_t *idx_info) HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); - HDassert(!H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(!H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(NULL == idx_info->layout->u.chunk.u.farray.fa); HDassert(idx_info->layout->u.chunk.nchunks); @@ -714,7 +714,7 @@ H5D_farray_idx_create(const H5D_chk_idx_info_t *idx_info) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create fixed array") /* Get the address of the fixed array in file */ - if(H5FA_get_addr(idx_info->layout->u.chunk.u.farray.fa, &(idx_info->layout->store.u.chunk.u.farray.addr)) < 0) + if(H5FA_get_addr(idx_info->layout->u.chunk.u.farray.fa, &(idx_info->layout->store.u.chunk.idx_addr)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query fixed array address") done: @@ -745,7 +745,7 @@ H5D_farray_idx_is_space_alloc(const H5O_layout_t *layout) HDassert(layout); /* Set return value */ - ret_value = (hbool_t)H5F_addr_defined(layout->store.u.chunk.u.farray.addr); + ret_value = (hbool_t)H5F_addr_defined(layout->store.u.chunk.idx_addr); FUNC_LEAVE_NOAPI(ret_value) } /* end H5D_farray_idx_is_space_alloc() */ @@ -777,7 +777,7 @@ H5D_farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata) HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); - HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(udata); /* Check if the fixed array is open yet */ @@ -922,7 +922,7 @@ H5D_farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udat HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); - HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(udata); /* Check if the fixed array is open yet */ @@ -1055,7 +1055,7 @@ H5D_farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); - HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(chunk_cb); HDassert(chunk_udata); @@ -1125,7 +1125,7 @@ H5D_farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); - HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(udata); /* Check if the fixed array is open yet */ @@ -1265,7 +1265,7 @@ H5D_farray_idx_delete(const H5D_chk_idx_info_t *idx_info) HDassert(idx_info->layout); /* Check if the index data structure has been allocated */ - if(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)) { + if(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)) { H5FA_t *fa; /* Pointer to fixed array structure */ H5FA_stat_t fa_stat; /* Fixed array statistics */ @@ -1304,9 +1304,9 @@ H5D_farray_idx_delete(const H5D_chk_idx_info_t *idx_info) idx_info->layout->u.chunk.u.farray.fa = NULL; /* Delete fixed array */ - if(H5FA_delete(idx_info->f, idx_info->dxpl_id, idx_info->layout->store.u.chunk.u.farray.addr) < 0) + if(H5FA_delete(idx_info->f, idx_info->dxpl_id, idx_info->layout->store.u.chunk.idx_addr) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete chunk fixed array") - idx_info->layout->store.u.chunk.u.farray.addr = HADDR_UNDEF; + idx_info->layout->store.u.chunk.idx_addr = HADDR_UNDEF; } /* end if */ else HDassert(NULL == idx_info->layout->u.chunk.u.farray.fa); @@ -1345,7 +1345,7 @@ H5D_farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, HDassert(idx_info_dst->f); HDassert(idx_info_dst->pline); HDassert(idx_info_dst->layout); - HDassert(!H5F_addr_defined(idx_info_dst->layout->store.u.chunk.u.farray.addr)); + HDassert(!H5F_addr_defined(idx_info_dst->layout->store.u.chunk.idx_addr)); /* Check if the source fixed array is open yet */ if(NULL == idx_info_src->layout->u.chunk.u.farray.fa) { @@ -1357,7 +1357,7 @@ H5D_farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, /* Create the fixed array that describes chunked storage in the dest. file */ if(H5D_farray_idx_create(idx_info_dst) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize chunked storage") - HDassert(H5F_addr_defined(idx_info_dst->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info_dst->layout->store.u.chunk.idx_addr)); done: FUNC_LEAVE_NOAPI(ret_value) @@ -1430,7 +1430,7 @@ H5D_farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); - HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.u.farray.addr)); + HDassert(H5F_addr_defined(idx_info->layout->store.u.chunk.idx_addr)); HDassert(index_size); /* Open the fixed array in file */ @@ -1480,7 +1480,7 @@ H5D_farray_idx_reset(H5O_layout_t *layout, hbool_t reset_addr) /* Reset index info */ if(reset_addr) - layout->store.u.chunk.u.farray.addr = HADDR_UNDEF; + layout->store.u.chunk.idx_addr = HADDR_UNDEF; layout->u.chunk.u.farray.fa = NULL; FUNC_LEAVE_NOAPI(SUCCEED) @@ -1510,7 +1510,7 @@ H5D_farray_idx_dump(const H5D_chk_idx_info_t *idx_info, FILE *stream) HDassert(idx_info->layout); HDassert(stream); - HDfprintf(stream, " Address: %a\n", idx_info->layout->store.u.chunk.u.farray.addr); + HDfprintf(stream, " Address: %a\n", idx_info->layout->store.u.chunk.idx_addr); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5D_farray_idx_dump() */ |