diff options
Diffstat (limited to 'src/H5Fstdio.c')
| -rw-r--r-- | src/H5Fstdio.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/H5Fstdio.c b/src/H5Fstdio.c index ae31305..eff325f 100644 --- a/src/H5Fstdio.c +++ b/src/H5Fstdio.c @@ -24,11 +24,11 @@ static herr_t 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, const H5D_transfer_t xfer_mode, const haddr_t *addr, size_t size, - uint8 *buf/*out*/); + uint8_t *buf/*out*/); static herr_t H5F_stdio_write(H5F_low_t *lf, const H5F_access_t *access_parms, const H5D_transfer_t xfer_mode, const haddr_t *addr, size_t size, - const uint8 *buf); + const uint8_t *buf); static herr_t H5F_stdio_flush(H5F_low_t *lf, const H5F_access_t *access_parms); const H5F_low_class_t H5F_LOW_STDIO_g[1] = {{ @@ -184,12 +184,12 @@ H5F_stdio_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms) static herr_t H5F_stdio_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, const H5D_transfer_t __unused__ xfer_mode, - const haddr_t *addr, size_t size, uint8 *buf/*out*/) + const haddr_t *addr, size_t size, uint8_t *buf/*out*/) { size_t n; - uint64 mask; + uint64_t mask; #ifdef HAVE_FSEEK64 - int64 offset; + int64_t offset; #else long offset; #endif @@ -197,21 +197,21 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, FUNC_ENTER(H5F_stdio_read, FAIL); /* Check for overflow */ - mask = (uint64)1 << (8*sizeof(offset)-1); + mask = (uint64_t)1 << (8*sizeof(offset)-1); if (addr->offset >= mask || addr->offset + size < addr->offset || addr->offset+size >= mask) { HRETURN_ERROR (H5E_IO, H5E_OVERFLOW, FAIL, "file address overflowed"); } #ifdef HAVE_FSEEK64 - offset = (int64)(addr->offset); /*checked for overflow*/ + offset = (int64_t)(addr->offset); /*checked for overflow*/ #else offset = (long)(addr->offset); /*checked for overflow*/ #endif /* Check easy cases */ if (0 == size) HRETURN(SUCCEED); - if ((uint64)offset >= lf->eof.offset) { + if ((uint64_t)offset >= lf->eof.offset) { HDmemset(buf, 0, size); HRETURN(SUCCEED); } @@ -261,7 +261,7 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, */ lf->u.stdio.op = H5F_OP_READ; #ifdef HAVE_FSEEK64 - lf->u.stdio.cur = (int64)(offset+n); /*checked for overflow above*/ + lf->u.stdio.cur = (int64_t)(offset+n); /*checked for overflow above*/ #else lf->u.stdio.cur = (off_t)(offset+n); /*checked for overflow above*/ #endif @@ -293,12 +293,12 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, static herr_t H5F_stdio_write(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, const H5D_transfer_t __unused__ xfer_mode, - const haddr_t *addr, size_t size, const uint8 *buf) + const haddr_t *addr, size_t size, const uint8_t *buf) { - uint64 mask; + uint64_t mask; #ifdef HAVE_FSEEK64 - int64 offset; - uint64 n; + int64_t offset; + uint64_t n; #else long offset; size_t n; @@ -307,14 +307,14 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, FUNC_ENTER(H5F_stdio_write, FAIL); /* Check for overflow */ - mask = (uint64)1 << (8*sizeof(offset)-1); + mask = (uint64_t)1 << (8*sizeof(offset)-1); if (addr->offset >= mask || addr->offset+size < addr->offset || addr->offset+size >= mask) { HRETURN_ERROR (H5E_IO, H5E_OVERFLOW, FAIL, "file address overflowed"); } #ifdef HAVE_FSEEK64 - offset = (int64)(addr->offset); /*checked for overflow*/ + offset = (int64_t)(addr->offset); /*checked for overflow*/ n = size; /*checked for overflow*/ #else offset = (long)(addr->offset); /*checked for overflow*/ @@ -353,7 +353,7 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms, * Update seek optimizing data. */ lf->u.stdio.op = H5F_OP_WRITE; - lf->u.stdio.cur = offset + (int64)n; + lf->u.stdio.cur = offset + (int64_t)n; FUNC_LEAVE(SUCCEED); } |