From d4f3fb01fce5e8a0d0fedbecdf3d73a4e708ad53 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 1 Dec 2024 10:31:03 +0900 Subject: [PATCH] Make some methods const (#2614) Found via cppcheck --inconclusive. --- src/curl.cpp | 2 +- src/curl.h | 2 +- src/fdcache_page.cpp | 2 +- src/fdcache_page.h | 2 +- src/fdcache_untreated.cpp | 2 +- src/fdcache_untreated.h | 2 +- src/s3fs_cred.cpp | 2 +- src/s3fs_cred.h | 2 +- src/s3fs_logger.cpp | 2 +- src/s3fs_logger.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/curl.cpp b/src/curl.cpp index 8ab7580..01dd260 100644 --- a/src/curl.cpp +++ b/src/curl.cpp @@ -1089,7 +1089,7 @@ bool S3fsCurl::SetIPResolveType(const char* value) return true; } -int S3fsCurl::MapPutErrorResponse(int result) +int S3fsCurl::MapPutErrorResponse(int result) const { if(result != 0){ return result; diff --git a/src/curl.h b/src/curl.h index de09db9..975918a 100644 --- a/src/curl.h +++ b/src/curl.h @@ -254,7 +254,7 @@ class S3fsCurl int MultipartUploadCopyPartSetup(const char* from, const char* to, int part_num, const std::string& upload_id, const headers_t& meta); bool MultipartUploadContentPartComplete(); bool MultipartUploadCopyPartComplete(); - int MapPutErrorResponse(int result); + int MapPutErrorResponse(int result) const; public: // class methods diff --git a/src/fdcache_page.cpp b/src/fdcache_page.cpp index 856aa0f..7daa52a 100644 --- a/src/fdcache_page.cpp +++ b/src/fdcache_page.cpp @@ -1000,7 +1000,7 @@ void PageList::Dump() const // If it is a bad area in the previous case, it will be reported as an error. // If the latter case does not match, it will be reported as a warning. // -bool PageList::CompareSparseFile(int fd, size_t file_size, fdpage_list_t& err_area_list, fdpage_list_t& warn_area_list) +bool PageList::CompareSparseFile(int fd, size_t file_size, fdpage_list_t& err_area_list, fdpage_list_t& warn_area_list) const { err_area_list.clear(); warn_area_list.clear(); diff --git a/src/fdcache_page.h b/src/fdcache_page.h index 3113be1..e11ac30 100644 --- a/src/fdcache_page.h +++ b/src/fdcache_page.h @@ -125,7 +125,7 @@ class PageList bool Compress(); bool Deserialize(CacheFileStat& file, ino_t inode); void Dump() const; - bool CompareSparseFile(int fd, size_t file_size, fdpage_list_t& err_area_list, fdpage_list_t& warn_area_list); + bool CompareSparseFile(int fd, size_t file_size, fdpage_list_t& err_area_list, fdpage_list_t& warn_area_list) const; }; #endif // S3FS_FDCACHE_PAGE_H_ diff --git a/src/fdcache_untreated.cpp b/src/fdcache_untreated.cpp index 2b7e083..628198d 100644 --- a/src/fdcache_untreated.cpp +++ b/src/fdcache_untreated.cpp @@ -27,7 +27,7 @@ //------------------------------------------------ // UntreatedParts methods //------------------------------------------------ -bool UntreatedParts::empty() +bool UntreatedParts::empty() const { const std::lock_guard lock(untreated_list_lock); return untreated_list.empty(); diff --git a/src/fdcache_untreated.h b/src/fdcache_untreated.h index 765c3aa..5d3d87d 100644 --- a/src/fdcache_untreated.h +++ b/src/fdcache_untreated.h @@ -48,7 +48,7 @@ class UntreatedParts UntreatedParts& operator=(const UntreatedParts&) = delete; UntreatedParts& operator=(UntreatedParts&&) = delete; - bool empty(); + bool empty() const; bool AddPart(off_t start, off_t size); bool GetLastUpdatedPart(off_t& start, off_t& size, off_t max_size, off_t min_size = MIN_MULTIPART_SIZE) const { return RowGetPart(start, size, max_size, min_size, true); } diff --git a/src/s3fs_cred.cpp b/src/s3fs_cred.cpp index f26c9f3..fe7ed7d 100644 --- a/src/s3fs_cred.cpp +++ b/src/s3fs_cred.cpp @@ -1039,7 +1039,7 @@ bool S3fsCred::InitialS3fsCredentials() //------------------------------------------------------------------- // Methods : for IAM //------------------------------------------------------------------- -bool S3fsCred::ParseIAMCredentialResponse(const char* response, iamcredmap_t& keyval) +bool S3fsCred::ParseIAMCredentialResponse(const char* response, iamcredmap_t& keyval) const { if(!response){ return false; diff --git a/src/s3fs_cred.h b/src/s3fs_cred.h index a14c38c..b70fd71 100644 --- a/src/s3fs_cred.h +++ b/src/s3fs_cred.h @@ -148,7 +148,7 @@ class S3fsCred bool ReadAwsCredentialFile(const std::string &filename) REQUIRES(S3fsCred::token_lock); bool InitialS3fsCredentials() REQUIRES(S3fsCred::token_lock); - bool ParseIAMCredentialResponse(const char* response, iamcredmap_t& keyval); + bool ParseIAMCredentialResponse(const char* response, iamcredmap_t& keyval) const; bool GetIAMCredentialsURL(std::string& url, bool check_iam_role) REQUIRES(S3fsCred::token_lock); bool LoadIAMCredentials() REQUIRES(S3fsCred::token_lock); diff --git a/src/s3fs_logger.cpp b/src/s3fs_logger.cpp index 119e14d..7a6b411 100644 --- a/src/s3fs_logger.cpp +++ b/src/s3fs_logger.cpp @@ -234,7 +234,7 @@ S3fsLog::s3fs_log_level S3fsLog::LowSetLogLevel(s3fs_log_level level) return old; } -S3fsLog::s3fs_log_level S3fsLog::LowBumpupLogLevel() +S3fsLog::s3fs_log_level S3fsLog::LowBumpupLogLevel() const { if(S3fsLog::pSingleton != this){ S3FS_PRN_ERR("This object is not as same as S3fsLog::pSingleton."); diff --git a/src/s3fs_logger.h b/src/s3fs_logger.h index 6d96ab2..25870d3 100644 --- a/src/s3fs_logger.h +++ b/src/s3fs_logger.h @@ -67,7 +67,7 @@ class S3fsLog bool LowLoadEnv(); bool LowSetLogfile(const char* pfile); s3fs_log_level LowSetLogLevel(s3fs_log_level level); - s3fs_log_level LowBumpupLogLevel(); + s3fs_log_level LowBumpupLogLevel() const; public: static bool IsS3fsLogLevel(s3fs_log_level level);