extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-26 15:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

separate RenameOp definition from implementation to avoid gcc 4.3 errors

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@31 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2008-07-01 07:44:51 +00:00
parent ff1c0828d8
commit 9bee8d7355
1 changed files with 92 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
encfs/DirNode.cpp
View File

@ -190,8 +190,19 @@ public:
{ {
} }
~RenameOp() ~RenameOp();
operator bool () const
{ {
return renameList;
}
bool apply();
void undo();
};
RenameOp::~RenameOp()
{
if(renameList) if(renameList)
{ {
// got a bunch of decoded filenames sitting in memory.. do a little // got a bunch of decoded filenames sitting in memory.. do a little
@ -203,15 +214,10 @@ public:
it->newPName.assign( it->newPName.size(), ' ' ); it->newPName.assign( it->newPName.size(), ' ' );
} }
} }
} }
operator bool () const bool RenameOp::apply()
{ {
return renameList;
}
bool apply()
{
try try
{ {
while(last != renameList->end()) while(last != renameList->end())
@ -244,10 +250,10 @@ public:
err.log( _RLWarningChannel ); err.log( _RLWarningChannel );
return false; return false;
} }
} }
void undo() void RenameOp::undo()
{ {
rDebug("in undoRename"); rDebug("in undoRename");
if(last == renameList->begin()) if(last == renameList->begin())
@ -282,8 +288,7 @@ public:
}; };
rWarning("Undo rename count: %i", undoCount); rWarning("Undo rename count: %i", undoCount);
} }
};
DirNode::DirNode(EncFS_Context *_ctx, DirNode::DirNode(EncFS_Context *_ctx,
const string &sourceDir, const shared_ptr<Config> &_config) const string &sourceDir, const shared_ptr<Config> &_config)