diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-10-08 14:40:18 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-10-08 15:48:21 (GMT) |
| commit | cdbe6b78f0e5dfd90b8a85beeb762b668ba29fe3 (patch) | |
| tree | d2effdc8a5999cb263ec0d0f607ed36d45fd3160 /src/H5FDs3comms.c | |
| parent | 29874423bf155e23cfdc1920336c91674865f417 (diff) | |
| download | hdf5-cdbe6b78f0e5dfd90b8a85beeb762b668ba29fe3.zip hdf5-cdbe6b78f0e5dfd90b8a85beeb762b668ba29fe3.tar.gz hdf5-cdbe6b78f0e5dfd90b8a85beeb762b668ba29fe3.tar.bz2 | |
Merge changes from develop
Comments and whitespace
Skip file-locking and cache changes
Diffstat (limited to 'src/H5FDs3comms.c')
| -rw-r--r-- | src/H5FDs3comms.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c index 0745acf..2ac27d0 100644 --- a/src/H5FDs3comms.c +++ b/src/H5FDs3comms.c @@ -1267,8 +1267,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest) rangebytesstr = (char *)H5MM_malloc(sizeof(char) * (S3COMMS_MAX_RANGE_STRING_SIZE + 1)); if (rangebytesstr == NULL) HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "could not malloc range format string."); - ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE), - "bytes=" H5_PRINTF_HADDR_FMT "-" H5_PRINTF_HADDR_FMT, offset, offset + len - 1); + ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE), "bytes=%" PRIuHADDR "-%" PRIuHADDR, + offset, offset + len - 1); if (ret <= 0 || ret >= S3COMMS_MAX_RANGE_STRING_SIZE) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to format HTTP Range value"); } @@ -1276,8 +1276,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest) rangebytesstr = (char *)H5MM_malloc(sizeof(char) * (S3COMMS_MAX_RANGE_STRING_SIZE + 1)); if (rangebytesstr == NULL) HGOTO_ERROR(H5E_ARGS, H5E_CANTALLOC, FAIL, "could not malloc range format string."); - ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE), "bytes=" H5_PRINTF_HADDR_FMT "-", - offset); + ret = HDsnprintf(rangebytesstr, (S3COMMS_MAX_RANGE_STRING_SIZE), "bytes=%" PRIuHADDR "-", offset); if (ret <= 0 || ret >= S3COMMS_MAX_RANGE_STRING_SIZE) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to format HTTP Range value"); } |