summaryrefslogtreecommitdiffstats
path: root/src/H5Flow.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-08-27 16:48:50 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-08-27 16:48:50 (GMT)
commiteb5e01d37ca2570afc50756c9ed6a0be214502ec (patch)
tree08281269dc5b2eeef48286fb991bd6a05f71f6a3 /src/H5Flow.c
parent11f1b67c878b17abc225d09fb2a2019f338f92b2 (diff)
downloadhdf5-eb5e01d37ca2570afc50756c9ed6a0be214502ec.zip
hdf5-eb5e01d37ca2570afc50756c9ed6a0be214502ec.tar.gz
hdf5-eb5e01d37ca2570afc50756c9ed6a0be214502ec.tar.bz2
[svn-r620] Changes since 19980825
---------------------- ./MANIFEST ./src/H5R.c [NEW] ./src/H5Rprivate.h [NEW] ./src/H5Rpublic.h [NEW] ./src/Makefile.in ./src/hdf5.h ./test/ragged.c [NEW] Preliminary support for 2d ragged arrays for Mark Miller and Jim Reus. Not fully implemented yet. The test is not actually part of `make test' because we still have some memory problems. ./src/H5E.c ./src/H5Epublic.h Added H5E_RAGGED as a major error number. ./bin/release Checks the MANIFEST file against `svf ls' on systems that have it. ./bin/trace Fixed a bug that caused arguments of type `void *x[]' to not be handled. ./src/H5.c Removed unused variables and changed a couple types to fix compiler warnings. Added tracing support for ragged array object ID's and arrays of pointers. ./src/H5D.c H5Dcreate() will complain if either of the property lists are invalid (instead of using the default). ./src/H5D.c ./src/H5Dprivate.h Split H5Dget_space() into an API and internal function so it can be called from the new ragged array layer. ./src/H5Fistore.c Fixed warnings about unsigned vs. signed comparisons. ./src/H5Flow.c Fixed a warning about a variable being shadowed in the MPI-IO stuff. ./src/H5Iprivate.h ./src/H5Ipublic.h Added the H5_RAGGED atom group. ./src/H5Shyper.c Fixed some freeing-free-memory errors that resulted when certain arrays were freed but the pointers were left in the data structures. I simply set the pointers to null after they were freed. ./src/H5Sprivate.h ./src/H5Sselect.c Split the H5Sselect_hyperslab() function into an API and a private function so it could be called from the ragged array layer. Added H5S_SEL_ERROR and H5S_SEL_N to the switch statements to get rid or compiler warnings. ./src/H5Tconv.c Removed a misleading comment. ./test/bittests.c Fixed a warning about a printf(). ./test/cmpd_dset.c Fixed warnings about unused variables because of test #11 being commented out. ./bin/trace Shortened the right margin for the output to allow room for the `);' at the end of the TRACE() macros.
Diffstat (limited to 'src/H5Flow.c')
-rw-r--r--src/H5Flow.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Flow.c b/src/H5Flow.c
index 7fd81a9..eec5714 100644
--- a/src/H5Flow.c
+++ b/src/H5Flow.c
@@ -282,7 +282,7 @@ H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms,
haddr_t tmp_addr;
#ifdef HAVE_PARALLEL
- int use_types;
+ int use_types=0;
#endif
FUNC_ENTER(H5F_low_write, FAIL);
@@ -293,8 +293,8 @@ H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms,
/* check for writing past the end of file marker */
#ifdef HAVE_PARALLEL
- if (H5F_LOW_MPIO==access_parms->driver
- && access_parms->u.mpio.use_types) {
+ if (H5F_LOW_MPIO==access_parms->driver &&
+ access_parms->u.mpio.use_types) {
/* In the case of fancy use of MPI datatypes, the addr and size
* parameters have a very peculiar interpretation.
* It is logically possible, but quite complex, to calculate
@@ -335,11 +335,11 @@ H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms,
if (H5F_LOW_MPIO==access_parms->driver && use_types) {
/* set logical eof to current physical eof
* (ephemeral though it may be...) */
- MPI_Offset size;
- if (MPI_SUCCESS != MPI_File_get_size(lf->u.mpio.f,&size)) {
- HRETURN_ERROR(H5E_IO, H5E_MPI, NULL, "couldn't get file size" );
+ MPI_Offset mpi_offset_size;
+ if (MPI_SUCCESS != MPI_File_get_size(lf->u.mpio.f,&mpi_offset_size)) {
+ HRETURN_ERROR(H5E_IO, H5E_MPI, FAIL, "couldn't get file size" );
}
- lf->eof.offset = size;
+ lf->eof.offset = mpi_offset_size;
}
#endif