diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-04-26 13:33:38 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-04-26 13:33:38 (GMT) |
commit | e987b73f58ecea72d034ae39a70ad5d5c3bec9ab (patch) | |
tree | 49d8cd6b0bb10d435d1836bc974fe28f34929e34 /src/H5HL.c | |
parent | 53da2a393f542b046faccba5171689f6f34d89cf (diff) | |
download | hdf5-e987b73f58ecea72d034ae39a70ad5d5c3bec9ab.zip hdf5-e987b73f58ecea72d034ae39a70ad5d5c3bec9ab.tar.gz hdf5-e987b73f58ecea72d034ae39a70ad5d5c3bec9ab.tar.bz2 |
[svn-r1216] Changes since 19990423
----------------------
./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5Farray.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fmpio.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5Gnode.c
./src/H5HG.c
./src/H5HL.c
./src/H5O.c
Changed H5F_block_read/write() to take a file transfer
property list instead of just a parallel I/O mode. This will
allow us to pass additional parameters to the I/O functions
without having so many arguments to worry about.
This fixes a bug I introduced last Friday for parallel HDF5
./src/H5B.c
Fixed decoding of B-tree keys when iterating through the
leaves of the B-tree. This fixes a bug for applications that are
adding new entries to groups and also listing the groups.
Diffstat (limited to 'src/H5HL.c')
-rw-r--r-- | src/H5HL.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -205,7 +205,7 @@ H5HL_load(H5F_t *f, const haddr_t *addr, const void UNUSED *udata1, assert(!udata2); if (H5F_block_read(f, addr, (hsize_t)H5HL_SIZEOF_HDR(f), - H5D_XFER_DFLT, hdr) < 0) { + &H5F_xfer_dflt, hdr) < 0) { HRETURN_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read heap header"); } @@ -245,7 +245,7 @@ H5HL_load(H5F_t *f, const haddr_t *addr, const void UNUSED *udata1, } if (heap->disk_alloc && H5F_block_read(f, &(heap->addr), (hsize_t)(heap->disk_alloc), - H5D_XFER_DFLT, heap->chunk + H5HL_SIZEOF_HDR(f)) < 0) { + &H5F_xfer_dflt, heap->chunk + H5HL_SIZEOF_HDR(f)) < 0) { HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unable to read heap data"); } @@ -381,7 +381,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr, H5HL_t *heap) #endif /* HAVE_PARALLEL */ if (H5F_block_write(f, addr, (hsize_t)(H5HL_SIZEOF_HDR(f)+heap->disk_alloc), - H5D_XFER_DFLT, heap->chunk) < 0) { + &H5F_xfer_dflt, heap->chunk) < 0) { HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap header and data to file"); } @@ -390,7 +390,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr, H5HL_t *heap) H5F_mpio_tas_allsame( f->shared->lf, TRUE ); /* only p0 writes */ #endif /* HAVE_PARALLEL */ if (H5F_block_write(f, addr, (hsize_t)H5HL_SIZEOF_HDR(f), - H5D_XFER_DFLT, heap->chunk)<0) { + &H5F_xfer_dflt, heap->chunk)<0) { HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap header to file"); } @@ -398,7 +398,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr, H5HL_t *heap) H5F_mpio_tas_allsame( f->shared->lf, TRUE ); /* only p0 writes */ #endif /* HAVE_PARALLEL */ if (H5F_block_write(f, &(heap->addr), (hsize_t)(heap->disk_alloc), - H5D_XFER_DFLT, + &H5F_xfer_dflt, heap->chunk + H5HL_SIZEOF_HDR(f)) < 0) { HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap data to file"); |