octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-02 18:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some method parameters (#2553)

Browse Source 
Add const where possible and avoid unnecessary reference parameters.
This commit is contained in:
Andrew Gaul 2024-10-18 00:05:42 +09:00 committed by GitHub
parent 473f9df65a
commit c5031a5a97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/curl.cpp
View File

@ -4003,7 +4003,7 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
return 0; return 0;
} }
int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, const std::string& upload_id, etaglist_t& parts) int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, const std::string& upload_id, const etaglist_t& parts)
{ {
S3FS_PRN_INFO3("[tpath=%s][parts=%zu]", SAFESTRPTR(tpath), parts.size()); S3FS_PRN_INFO3("[tpath=%s][parts=%zu]", SAFESTRPTR(tpath), parts.size());
@ -4014,7 +4014,7 @@ int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, const std::string&
// make contents // make contents
std::string postContent; std::string postContent;
postContent += "<CompleteMultipartUpload>\n"; postContent += "<CompleteMultipartUpload>\n";
for(etaglist_t::iterator it = parts.begin(); it != parts.end(); ++it){ for(auto it = parts.begin(); it != parts.end(); ++it){
if(it->etag.empty()){ if(it->etag.empty()){
S3FS_PRN_ERR("%d file part is not finished uploading.", it->part_num); S3FS_PRN_ERR("%d file part is not finished uploading.", it->part_num);
return -EIO; return -EIO;

2
src/curl.h
View File

@ -385,7 +385,7 @@ class S3fsCurl
int CheckBucket(const char* check_path, bool compat_dir, bool force_no_sse); int CheckBucket(const char* check_path, bool compat_dir, bool force_no_sse);
int ListBucketRequest(const char* tpath, const char* query); int ListBucketRequest(const char* tpath, const char* query);
int PreMultipartPostRequest(const char* tpath, headers_t& meta, std::string& upload_id, bool is_copy); int PreMultipartPostRequest(const char* tpath, headers_t& meta, std::string& upload_id, bool is_copy);
int CompleteMultipartPostRequest(const char* tpath, const std::string& upload_id, etaglist_t& parts); int CompleteMultipartPostRequest(const char* tpath, const std::string& upload_id, const etaglist_t& parts);
int UploadMultipartPostRequest(const char* tpath, int part_num, const std::string& upload_id); int UploadMultipartPostRequest(const char* tpath, int part_num, const std::string& upload_id);
bool MixMultipartPostComplete(); bool MixMultipartPostComplete();
int MultipartListRequest(std::string& body); int MultipartListRequest(std::string& body);

2
src/fdcache_fdinfo.cpp
View File

@ -697,7 +697,7 @@ bool PseudoFdInfo::CancelAllThreads()
// [NOTE] // [NOTE]
// Maximum multipart upload size must be uploading boundary. // Maximum multipart upload size must be uploading boundary.
// //
bool PseudoFdInfo::ExtractUploadPartsFromUntreatedArea(const off_t& untreated_start, const off_t& untreated_size, mp_part_list_t& to_upload_list, filepart_list_t& cancel_upload_list, off_t max_mp_size) bool PseudoFdInfo::ExtractUploadPartsFromUntreatedArea(off_t untreated_start, off_t untreated_size, mp_part_list_t& to_upload_list, filepart_list_t& cancel_upload_list, off_t max_mp_size)
{ {
if(untreated_start < 0 || untreated_size <= 0){ if(untreated_start < 0 || untreated_size <= 0){
S3FS_PRN_ERR("Parameters are wrong(untreated_start=%lld, untreated_size=%lld).", static_cast<long long int>(untreated_start), static_cast<long long int>(untreated_size)); S3FS_PRN_ERR("Parameters are wrong(untreated_start=%lld, untreated_size=%lld).", static_cast<long long int>(untreated_start), static_cast<long long int>(untreated_size));

2
src/fdcache_fdinfo.h
View File

@ -86,7 +86,7 @@ class PseudoFdInfo
bool ParallelMultipartUpload(const char* path, const mp_part_list_t& mplist, bool is_copy); bool ParallelMultipartUpload(const char* path, const mp_part_list_t& mplist, bool is_copy);
bool InsertUploadPart(off_t start, off_t size, int part_num, bool is_copy, etagpair** ppetag); bool InsertUploadPart(off_t start, off_t size, int part_num, bool is_copy, etagpair** ppetag);
bool CancelAllThreads(); bool CancelAllThreads();
bool ExtractUploadPartsFromUntreatedArea(const off_t& untreated_start, const off_t& untreated_size, mp_part_list_t& to_upload_list, filepart_list_t& cancel_upload_list, off_t max_mp_size); bool ExtractUploadPartsFromUntreatedArea(off_t untreated_start, off_t untreated_size, mp_part_list_t& to_upload_list, filepart_list_t& cancel_upload_list, off_t max_mp_size);
bool IsUploadingHasLock() const REQUIRES(upload_list_lock); bool IsUploadingHasLock() const REQUIRES(upload_list_lock);
public: public: