octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-22 08:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings on integer comparisons (#2558)

Browse Source 
Follows on to 2d1409a672.
This commit is contained in:
Andrew Gaul 2024-10-22 18:53:37 +09:00 committed by GitHub
parent 14f07626e0
commit b34e2711a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gnutls_auth.cpp
View File

@ -206,7 +206,7 @@ bool s3fs_md5_fd(int fd, off_t start, off_t size, md5_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<char, 512> buf; std::array<char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file
@ -216,7 +216,7 @@ bool s3fs_md5_fd(int fd, off_t start, off_t size, md5_t* result)
S3FS_PRN_ERR("file read error(%d)", errno); S3FS_PRN_ERR("file read error(%d)", errno);
return false; return false;
} }
md5_update(&ctx_md5, bytes, buf); md5_update(&ctx_md5, bytes, reinterpret_cast<const uint8_t*>(buf.data()));
} }
md5_digest(&ctx_md5, result->size(), result->data()); md5_digest(&ctx_md5, result->size(), result->data());
@ -260,7 +260,7 @@ bool s3fs_md5_fd(int fd, off_t start, off_t size, md5_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<char, 512> buf; std::array<char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file
@ -304,7 +304,7 @@ bool s3fs_sha256_fd(int fd, off_t start, off_t size, sha256_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<char, 512> buf; std::array<char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file
@ -314,7 +314,7 @@ bool s3fs_sha256_fd(int fd, off_t start, off_t size, sha256_t* result)
S3FS_PRN_ERR("file read error(%d)", errno); S3FS_PRN_ERR("file read error(%d)", errno);
return false; return false;
} }
sha256_update(&ctx_sha256, bytes, buf); sha256_update(&ctx_sha256, bytes, reinterpret_cast<const uint8_t*>(buf.data()));
} }
sha256_digest(&ctx_sha256, result->size(), result->data()); sha256_digest(&ctx_sha256, result->size(), result->data());
@ -359,7 +359,7 @@ bool s3fs_sha256_fd(int fd, off_t start, off_t size, sha256_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<char, 512> buf; std::array<char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file

4
src/nss_auth.cpp
View File

@ -176,7 +176,7 @@ bool s3fs_md5_fd(int fd, off_t start, off_t size, md5_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<unsigned char, 512> buf; std::array<unsigned char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file
@ -229,7 +229,7 @@ bool s3fs_sha256_fd(int fd, off_t start, off_t size, sha256_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<unsigned char, 512> buf; std::array<unsigned char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file

2
src/openssl_auth.cpp
View File

@ -239,7 +239,7 @@ bool s3fs_md5_fd(int fd, off_t start, off_t size, md5_t* result)
for(off_t total = 0; total < size; total += bytes){ for(off_t total = 0; total < size; total += bytes){
std::array<char, 512> buf; std::array<char, 512> buf;
bytes = buf.size() < (size - total) ? buf.size() : (size - total); bytes = std::min(static_cast<off_t>(buf.size()), (size - total));
bytes = pread(fd, buf.data(), bytes, start + total); bytes = pread(fd, buf.data(), bytes, start + total);
if(0 == bytes){ if(0 == bytes){
// end of file // end of file