github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-06-21 04:41:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move Path object to separate file

Browse Source
This commit is contained in:
Antonio SJ Musumeci
2015-06-22 23:22:51 -04:00
parent 23cca83742
commit 2bd44568a1
23 changed files with 98 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rename.cpp
View File

@ -44,7 +44,7 @@ int
_single_rename(const fs::find::Func searchFunc,
const vector<string> &srcmounts,
const size_t minfreespace,
const fs::Path &oldpath,
const Path &oldpath,
const string &newpath)
{
int rv;
@ -54,7 +54,7 @@ _single_rename(const fs::find::Func searchFunc,
if(rv == -1 && errno == ENOENT)
{
string dirname;
fs::Paths newpathdir;
Paths newpathdir;
dirname = fs::dirname(newpath);
rv = searchFunc(srcmounts,dirname,minfreespace,newpathdir);
@ -83,14 +83,14 @@ _rename(const fs::find::Func searchFunc,
{
int rv;
int error;
fs::Paths oldpaths;
Paths oldpaths;
rv = actionFunc(srcmounts,oldpath,minfreespace,oldpaths);
if(rv == -1)
return -errno;
error = 0;
for(fs::Paths::const_iterator
for(Paths::const_iterator
i = oldpaths.begin(), ei = oldpaths.end(); i != ei; ++i)
{
rv = _single_rename(searchFunc,srcmounts,minfreespace,*i,newpath);