Corrected the Bu::File::canRead() and Bu::File::canWrite() functions, they work

now.  It helps to read the system docs.  Anyway, nids is all fixed up, it seems
to work great now, and I guess I got all the corner cases we'll hit for a while,
fishtrax really did a number on them :)

I also cleaned up all the debugging output, now you can see your program run
instead of libbu++ internals.

There could still be a good amount of improvement made in nids, it really
shouldn't re-write whole blocks every time you write to a stream, but that will
be an easy change down the line that won't effect any of the existing code.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/nids.cpp b/src/nids.cpp
index 00d5f2b..23c11b0 100644
--- a/src/nids.cpp
+++ b/src/nids.cpp
@@ -114,8 +114,8 @@ void Bu::Nids::initialize( int iBlockSize, int iPreAllocate )
 
 void Bu::Nids::updateHeader()
 {
-//      if( !sStore.canWrite() )
-//              return;
+        if( !sStore.canWrite() )
+                return;
         sStore.setPos( 10 ); // Skip the magic number, version, bpi, block size
         sStore.write( &iBlocks, 4 );
         sStore.write( &iUsed, 4 );
@@ -222,8 +222,8 @@ void Bu::Nids::setBlock( uint32_t uIndex, Bu::Nids::Block *pBlock )
 
 void Bu::Nids::updateStreamSize( uint32_t uIndex, uint32_t uSize )
 {
-//      if( !sStore.canWrite() )
-//              return;
+        if( !sStore.canWrite() )
+                return;
         sStore.setPos( iBlockStart + (iBlockSize*uIndex)+4*3 );
         sStore.write( &uSize, 4 );
 }
@@ -240,8 +240,8 @@ uint32_t Bu::Nids::getNextBlock( uint32_t uIndex,
                         sStore.setPos( iBlockStart + (iBlockSize*uIndex)+1*4 );
                         sStore.write( &uNew, 4 );
                         getBlock( uNew, pBlock );
-                        printf("Allocated new block (%u) for stream %u.\n",
-                                uNew, pBlock->uFirstBlock );
+                        //printf("Allocated new block (%u) for stream %u.\n",
+                        //      uNew, pBlock->uFirstBlock );
                 }
                 else
                 {