summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2015-01-23 14:59:04 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2015-01-23 14:59:04 (GMT)
commit2b43f9d3af44eff5ca538b7dab9435ecd1831a24 (patch)
tree57b5e90eb0597889cd3e5ffcd2a4287c1fb60cd9
parentfeb7135d5d8e82e13e177892f942e697410aa956 (diff)
downloadhdf5-2b43f9d3af44eff5ca538b7dab9435ecd1831a24.zip
hdf5-2b43f9d3af44eff5ca538b7dab9435ecd1831a24.tar.gz
hdf5-2b43f9d3af44eff5ca538b7dab9435ecd1831a24.tar.bz2
[svn-r26013] merge 26012 from trunk:
make the print format for address overflow error windows friendly.
-rw-r--r--src/H5FDint.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5FDint.c b/src/H5FDint.c
index 0027aa3..3575340 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -203,8 +203,8 @@ H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t add
if(HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
if((addr + file->base_addr + size) > eoa)
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%zu, eoa=%llu",
- (unsigned long long)(addr+ file->base_addr), size, (unsigned long long)eoa)
+ HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu",
+ (unsigned long long)(addr+ file->base_addr), (unsigned long long)size, (unsigned long long)eoa)
/* Dispatch to driver */
if((file->cls->read)(file, type, H5P_PLIST_ID(dxpl), addr + file->base_addr, size, buf) < 0)
@@ -252,8 +252,8 @@ H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t ad
if(HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
if((addr + file->base_addr + size) > eoa)
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%zu, eoa=%llu",
- (unsigned long long)(addr+ file->base_addr), size, (unsigned long long)eoa)
+ HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu",
+ (unsigned long long)(addr+ file->base_addr), (unsigned long long)size, (unsigned long long)eoa)
/* Dispatch to driver */
if((file->cls->write)(file, type, H5P_PLIST_ID(dxpl), addr + file->base_addr, size, buf) < 0)