diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-10-27 04:44:46 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-10-27 04:44:46 +0000 |
commit | 9906ffe3c54875133448134c09ec12a0949d48cd (patch) | |
tree | 0542fef3d27e796700b87b44394a3ad31dd5b852 /src/myriadfs.cpp | |
parent | 411f240da34bab53cd18aa8b7ba09834ede49b1c (diff) | |
parent | 029b5d159023f4dad607359dbfaa2479e21fe9e5 (diff) | |
download | libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.tar.gz libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.tar.bz2 libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.tar.xz libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.zip |
Reorg'd! I merged in the release-fixup branch and fixed all random warnings.
I also cleaned up the build script, the symlink generation is faster and looks
nicer, there's one think left to fix there, but it's not too bad.
Diffstat (limited to 'src/myriadfs.cpp')
-rw-r--r-- | src/myriadfs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/myriadfs.cpp b/src/myriadfs.cpp index cebae1c..6884a31 100644 --- a/src/myriadfs.cpp +++ b/src/myriadfs.cpp | |||
@@ -112,7 +112,7 @@ void Bu::MyriadFs::stat( const Bu::String &sPath, Bu::MyriadFs::Stat &rBuf ) | |||
112 | stat( iNode, rBuf, is ); | 112 | stat( iNode, rBuf, is ); |
113 | } | 113 | } |
114 | 114 | ||
115 | Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode, | 115 | Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/, |
116 | uint16_t uPerms ) | 116 | uint16_t uPerms ) |
117 | { | 117 | { |
118 | int32_t iParent = -1; | 118 | int32_t iParent = -1; |
@@ -291,9 +291,9 @@ void Bu::MyriadFs::setTimes( const Bu::String &sPath, int64_t iATime, | |||
291 | void Bu::MyriadFs::unlink( const Bu::String &sPath ) | 291 | void Bu::MyriadFs::unlink( const Bu::String &sPath ) |
292 | { | 292 | { |
293 | int32_t iParent = -1; | 293 | int32_t iParent = -1; |
294 | int32_t iNode; | 294 | // int32_t iNode; |
295 | 295 | ||
296 | iNode = lookupInode( sPath, iParent ); | 296 | /*iNode =*/ lookupInode( sPath, iParent ); |
297 | 297 | ||
298 | Dir lDir = readDir( iParent ); | 298 | Dir lDir = readDir( iParent ); |
299 | 299 | ||
@@ -660,7 +660,7 @@ void Bu::MyriadFs::destroyNode( int32_t iNode ) | |||
660 | Bu::MyriadStream is = mStore.openStream( 2 ); | 660 | Bu::MyriadStream is = mStore.openStream( 2 ); |
661 | 661 | ||
662 | // This will be overwritten with the last node | 662 | // This will be overwritten with the last node |
663 | int32_t iPosition = hNodeIndex.get( iNode ); | 663 | uint32_t iPosition = hNodeIndex.get( iNode ); |
664 | RawStat rsOld; | 664 | RawStat rsOld; |
665 | readInode( iNode, rsOld, is ); | 665 | readInode( iNode, rsOld, is ); |
666 | switch( (rsOld.uPerms&typeMask) ) | 666 | switch( (rsOld.uPerms&typeMask) ) |