diff options
| author | Robb Matzke <matzke@llnl.gov> | 1999-07-28 19:37:35 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 1999-07-28 19:37:35 (GMT) |
| commit | 2681ce4a86ca3c6400ba242bc336d23c77753ff5 (patch) | |
| tree | f4cb88dcd07675a7a4c76141a080148cee1eabc7 /src/H5HL.c | |
| parent | e4834c43ce6528308ebd5375bd4c7a0df88af427 (diff) | |
| download | hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.zip hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.gz hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.bz2 | |
[svn-r1549] Changes since 19990728
----------------------
./src/H5B.c [1.3]
./src/H5D.c [1.3]
./src/H5F.c [1.3]
./src/H5Farray.c [1.3]
./src/H5Fcore.c [1.3]
./src/H5Ffamily.c [1.3]
./src/H5Fistore.c [1.3]
./src/H5Flow.c [1.3]
./src/H5Fmpio.c [1.3]
./src/H5Fprivate.h [1.3]
./src/H5Fsplit.c [1.3]
./src/H5Fstdio.c [1.3]
./src/H5G.c [1.3]
./src/H5HG.c [1.3]
./src/H5HL.c [1.3]
./src/H5MF.c [1.3]
./src/H5O.c [1.3]
./src/H5Odtype.c [1.3]
./src/H5Oefl.c [1.3]
./src/H5P.c [1.3]
./src/H5Smpio.c [1.3]
./src/H5T.c [1.3]
./src/H5detect.c [1.3]
./tools/h5debug.c [1.3]
Some of the H5F_addr_* functions were optimized away.
./src/H5D.c [1.3]
Fixed the return values from NULL to FAIL on one MPI-IO
function.
Diffstat (limited to 'src/H5HL.c')
| -rw-r--r-- | src/H5HL.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -112,7 +112,7 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr_p/*out*/) /* allocate file version */ total_size = H5HL_SIZEOF_HDR(f) + size_hint; if (H5MF_alloc(f, H5MF_META, (hsize_t)total_size, addr_p/*out*/) < 0) { - H5F_addr_undef(addr_p); + *addr_p = H5F_ADDR_UNDEF; HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate file memory"); } @@ -122,8 +122,7 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr_p/*out*/) HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); } - heap->addr = *addr_p; - H5F_addr_inc(&(heap->addr), (hsize_t)H5HL_SIZEOF_HDR(f)); + heap->addr = *addr_p + (hsize_t)H5HL_SIZEOF_HDR(f); heap->disk_alloc = size_hint; heap->mem_alloc = size_hint; if (NULL==(heap->chunk = H5MM_calloc(H5HL_SIZEOF_HDR(f) + size_hint))) { @@ -375,8 +374,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5HL_t *heap) /* * Copy buffer to disk. */ - hdr_end_addr = addr; - H5F_addr_inc(&hdr_end_addr, (hsize_t)H5HL_SIZEOF_HDR(f)); + hdr_end_addr = addr + (hsize_t)H5HL_SIZEOF_HDR(f); if (H5F_addr_eq(heap->addr, hdr_end_addr)) { /* The header and data are contiguous */ #ifdef HAVE_PARALLEL |