youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require C++14 (#2596)

Browse Source 
This only has some minor additions of std::make_unique, digits
separators, std::string literals, and more flexible constexpr.
References #2469.
This commit is contained in:
Andrew Gaul
2025-05-18 12:34:53 +09:00
committed by GitHub
parent 3421025074
commit f2542f22fe
27 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/s3fs_cred.cpp
View File

@ -38,6 +38,8 @@
#include "threadpoolman.h"
#include "s3fs_threadreqs.h"
using namespace std::string_literals;
//-------------------------------------------------------------------
// Symbols
//-------------------------------------------------------------------
@ -1012,7 +1014,7 @@ bool S3fsCred::InitialS3fsCredentials()
}
// 3b - check ${HOME}/.aws/credentials
std::string aws_credentials = std::string(getpwuid(getuid())->pw_dir) + "/.aws/credentials";
std::string aws_credentials = getpwuid(getuid())->pw_dir + "/.aws/credentials"s;
if(ReadAwsCredentialFile(aws_credentials)){
return true;
}else if(aws_profile != DEFAULT_AWS_PROFILE_NAME){
@ -1409,7 +1411,7 @@ int S3fsCred::DetectParam(const char* arg)
S3FS_PRN_EXIT("option ibm_iam_endpoint has invalid format, missing http / https protocol");
return -1;
}
endpoint_url = std::string(iam_endpoint) + "/identity/token";
endpoint_url = iam_endpoint + "/identity/token"s;
SetIAMCredentialsURL(endpoint_url.c_str());
set_builtin_cred_opts = true;
return 0;