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

Changed functions about reading passwd file.

Browse Source
This commit is contained in:
Takeshi Nakatani 2017-11-19 11:49:11 +00:00
parent 7d9ac0163b
commit 97fc845a6a
1 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/s3fs.cpp
View File

@ -3929,7 +3929,7 @@ static int parse_passwd_file(bucketkvmap_t& resmap)
kv[string(aws_secretkey)] = secret; kv[string(aws_secretkey)] = secret;
resmap[bucket] = kv; resmap[bucket] = kv;
} }
return (0 < resmap.size() ? 1 : 0); return (resmap.empty() ? 0 : 1);
} }
// //
@ -3942,7 +3942,7 @@ static int check_for_aws_format(const kvmap_t& kvmap)
string str1(aws_accesskeyid); string str1(aws_accesskeyid);
string str2(aws_secretkey); string str2(aws_secretkey);
if(0 == kvmap.size()){ if(kvmap.empty()){
return 0; return 0;
} }
if(kvmap.end() == kvmap.find(str1) && kvmap.end() == kvmap.find(str2)){ if(kvmap.end() == kvmap.find(str1) && kvmap.end() == kvmap.find(str2)){