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/H5Fmpio.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/H5Fmpio.c')
| -rw-r--r-- | src/H5Fmpio.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c index 11f8da5..88f9877 100644 --- a/src/H5Fmpio.c +++ b/src/H5Fmpio.c @@ -384,7 +384,7 @@ H5F_mpio_open(const char *name, const H5F_access_t *access_parms, uintn flags, } lf->u.mpio.f = fh; H5F_mpio_tas_allsame( lf, FALSE ); /* initialize */ - H5F_addr_reset(&(lf->eof)); + lf->eof = 0; mpierr = MPI_File_get_size( fh, &size ); if (MPI_SUCCESS != mpierr) { MPI_File_close( &(lf->u.mpio.f) ); @@ -397,7 +397,7 @@ H5F_mpio_open(const char *name, const H5F_access_t *access_parms, uintn flags, HRETURN_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "couldn't convert size to haddr_t" ); } - H5F_low_seteof( lf, &new_eof ); + H5F_low_seteof(lf, new_eof); } /* The unique key */ @@ -561,7 +561,7 @@ H5F_mpio_read(H5F_low_t *lf, H5F_access_t *access_parms, buf_type = access_parms->u.mpio.btype; file_type = access_parms->u.mpio.ftype; if (SUCCEED != - H5F_haddr_to_MPIOff(&(access_parms->u.mpio.disp), &mpi_disp)) { + H5F_haddr_to_MPIOff(access_parms->u.mpio.disp, &mpi_disp)) { HRETURN_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "couldn't convert addr to MPIOffset" ); } @@ -793,8 +793,7 @@ H5F_mpio_write(H5F_low_t *lf, H5F_access_t *access_parms, HRETURN_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "couldn't convert addr to MPIOffset" ); } - if (SUCCEED!=H5F_haddr_to_MPIOff(&(access_parms->u.mpio.disp), - &mpi_disp)) { + if (SUCCEED!=H5F_haddr_to_MPIOff(access_parms->u.mpio.disp, &mpi_disp)) { HRETURN_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "couldn't convert addr to MPIOffset" ); } @@ -837,7 +836,7 @@ H5F_mpio_write(H5F_low_t *lf, H5F_access_t *access_parms, buf_type = access_parms->u.mpio.btype; file_type = access_parms->u.mpio.ftype; if (SUCCEED != - H5F_haddr_to_MPIOff(&(access_parms->u.mpio.disp), &mpi_disp)) { + H5F_haddr_to_MPIOff(access_parms->u.mpio.disp, &mpi_disp)) { HRETURN_ERROR(H5E_IO, H5E_BADTYPE, FAIL, "couldn't convert addr to MPIOffset" ); } |