octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-06-26 12:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chaged codes about iterator

Browse Source
This commit is contained in:
Takeshi Nakatani 2015-06-13 03:08:56 +00:00
parent 84fb3d83d8
commit 0ecf4aa6b4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/s3fs.cpp
View File

@ -3119,24 +3119,26 @@ static int s3fs_removexattr(const char* path, const char* name)
}
// get xattrs
if(meta.end() == meta.find("x-amz-meta-xattr")){
headers_t::iterator hiter = meta.find("x-amz-meta-xattr");
if(meta.end() == hiter){
// object does not have xattrs
return -ENOATTR;
}
string strxattrs = meta["x-amz-meta-xattr"];
string strxattrs = hiter->second;
parse_xattrs(strxattrs, xattrs);
// check name xattrs
string strname = name;
if(xattrs.end() == xattrs.find(strname)){
string strname = name;
xattrs_t::iterator xiter = xattrs.find(strname);
if(xattrs.end() == xiter){
free_xattrs(xattrs);
return -ENOATTR;
}
// make new header_t after deleting name xattr
if(xattrs[strname]){
delete xattrs[strname];
if(xiter->second){
delete xiter->second;
}
xattrs.erase(strname);