diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-04-07 15:34:16 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-04-07 15:34:16 (GMT) |
commit | 68fa66bf8130d6a6e607e233da8cc61a154bf172 (patch) | |
tree | b5a0e0120492c7bb9f935ab74f4cef97d6bbcbee /src/H5Fstdio.c | |
parent | 92571bbe1d77c74ddefeeba6ac0b2097593c058d (diff) | |
download | hdf5-68fa66bf8130d6a6e607e233da8cc61a154bf172.zip hdf5-68fa66bf8130d6a6e607e233da8cc61a154bf172.tar.gz hdf5-68fa66bf8130d6a6e607e233da8cc61a154bf172.tar.bz2 |
[svn-r337] Changes since 19980403
----------------------
./configure.in
Moved setting of compiler warning switches earlier in the file.
Turned on more warning switches to gcc.
./config/linux
Prints a warning if the gcc version is less than 2.8.1 since
that version has problems with register allocation for `long
long'.
./html/Datatypes.html
Documented sharing of data types between datasets.
./src/H5G.c
./src/H5Gpublic.h
Implemented H5Gmove(), H5Glink() and H5Gunlink() for hard
links. Still have soft links to do.
./src/H5AC.c
./src/H5ACprivate.h
./src/H5D.c
./src/H5E.c
./src/H5Eprivate.h
./src/H5F.c
./src/H5Farray.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fpublic.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5HG.c
./src/H5HL.c
./src/H5HLprivate.h
./src/H5I.c
./src/H5Iprivate.h
./src/H5MM.c
./src/H5MMprivate.h
./src/H5O.c
./src/H5Oefl.c
./src/H5Oprivate.h
./src/H5Osdspace.c
./src/H5Oshared.c
./src/H5Ostab.c
./src/H5P.c
./src/H5S.c
./src/H5Ssimp.c
./src/H5T.c
./src/H5Tconv.c
./src/H5Tprivate.h
./src/H5Tpublic.h
./src/H5V.c
./src/H5Vprivate.h
./src/H5detect.c
./src/h5ls.c
./test/cmpd_dset.c
./test/dsets.c
./test/external.c
./test/hyperslab.c
./test/iopipe.c
./test/istore.c
./test/shtype.c
./test/tstab.c
Fixed comparisons between signed and unsigned values. Fixed
warnings about unused function arguments.
Diffstat (limited to 'src/H5Fstdio.c')
-rw-r--r-- | src/H5Fstdio.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/src/H5Fstdio.c b/src/H5Fstdio.c index 6224dd6..7e45878 100644 --- a/src/H5Fstdio.c +++ b/src/H5Fstdio.c @@ -70,7 +70,8 @@ const H5F_low_class_t H5F_LOW_STDIO_g[1] = {{ *------------------------------------------------------------------------- */ static H5F_low_t * -H5F_stdio_open(const char *name, const H5F_access_t *access_parms, +H5F_stdio_open(const char *name, + const H5F_access_t *access_parms __attribute__((unused)), uintn flags, H5F_search_t *key/*out*/) { H5F_low_t *lf = NULL; @@ -112,7 +113,9 @@ H5F_stdio_open(const char *name, const H5F_access_t *access_parms, if (fseek(lf->u.stdio.f, 0, SEEK_END) < 0) { lf->u.stdio.op = H5F_OP_UNKNOWN; } else { - H5F_addr_inc(&(lf->eof), ftell(lf->u.stdio.f)); + ssize_t x = ftell (lf->u.stdio.f); + assert (x>=0); + H5F_addr_inc(&(lf->eof), (size_t)x); } /* The unique key */ @@ -144,7 +147,8 @@ H5F_stdio_open(const char *name, const H5F_access_t *access_parms, *------------------------------------------------------------------------- */ static herr_t -H5F_stdio_close(H5F_low_t *lf, const H5F_access_t *access_parms) +H5F_stdio_close(H5F_low_t *lf, + const H5F_access_t *access_parms __attribute__((unused))) { FUNC_ENTER(H5F_stdio_close, FAIL); @@ -179,7 +183,8 @@ H5F_stdio_close(H5F_low_t *lf, const H5F_access_t *access_parms) *------------------------------------------------------------------------- */ static herr_t -H5F_stdio_read(H5F_low_t *lf, const H5F_access_t *access_parms, +H5F_stdio_read(H5F_low_t *lf, + const H5F_access_t *access_parms __attribute__((unused)), const haddr_t *addr, size_t size, uint8 *buf/*out*/) { size_t n; @@ -187,7 +192,7 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t *access_parms, #ifdef HAVE_FSEEK64 int64 offset; #else - off_t offset; + long offset; #endif FUNC_ENTER(H5F_stdio_read, FAIL); @@ -202,12 +207,12 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t *access_parms, #ifdef HAVE_FSEEK64 offset = (int64)(addr->offset); /*checked for overflow*/ #else - offset = (off_t)(addr->offset); /*checked for overflow*/ + offset = (long)(addr->offset); /*checked for overflow*/ #endif /* Check easy cases */ if (0 == size) HRETURN(SUCCEED); - if (offset >= lf->eof.offset) { + if ((uint64)offset >= lf->eof.offset) { HDmemset(buf, 0, size); HRETURN(SUCCEED); } @@ -287,16 +292,18 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t *access_parms, *------------------------------------------------------------------------- */ static herr_t -H5F_stdio_write(H5F_low_t *lf, const H5F_access_t *access_parms, +H5F_stdio_write(H5F_low_t *lf, + const H5F_access_t *access_parms __attribute__((unused)), const haddr_t *addr, size_t size, const uint8 *buf) { - ssize_t n; uint64 mask; #ifdef HAVE_FSEEK64 int64 offset; + uint64 n; #else - off_t offset; + long offset; + size_t n; #endif FUNC_ENTER(H5F_stdio_write, FAIL); @@ -310,10 +317,10 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t *access_parms, } #ifdef HAVE_FSEEK64 offset = (int64)(addr->offset); /*checked for overflow*/ - n = (int64)size; /*checked for overflow*/ + n = size; /*checked for overflow*/ #else offset = (long)(addr->offset); /*checked for overflow*/ - n = (off_t)size; /*checked for overflow*/ + n = size; /*checked for overflow*/ #endif /* @@ -333,6 +340,7 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t *access_parms, #endif lf->u.stdio.cur = offset; } + /* * Write the buffer. On successful return, the file position will be * advanced by the number of bytes read. Otherwise nobody knows where it @@ -342,11 +350,12 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t *access_parms, lf->u.stdio.op = H5F_OP_UNKNOWN; HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "fwrite failed"); } + /* * Update seek optimizing data. */ lf->u.stdio.op = H5F_OP_WRITE; - lf->u.stdio.cur = offset + n; + lf->u.stdio.cur = offset + (int64)n; FUNC_LEAVE(SUCCEED); } @@ -371,7 +380,8 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t *access_parms, *------------------------------------------------------------------------- */ static herr_t -H5F_stdio_flush(H5F_low_t *lf, const H5F_access_t *access_parms) +H5F_stdio_flush(H5F_low_t *lf, + const H5F_access_t *access_parms __attribute__((unused))) { FUNC_ENTER(H5F_stdio_flush, FAIL); |