Ok, NIDS is getting better and better, and I went ahead and cleaned up some

exception related code that's been annoying me.  You should no longer have to
include any exception header explicitly for normal operations, every class that
has it's own exception to throw defines it in it's own headers.

This may break some code that uses libbu++, but it's an easy fix, just delete
the include for exceptions.h.  Sometime soon I would also like to move from
Bu::ExceptionBase to Bu::Exception, but that will affect a lot more code than
this change did.

1 files changed, 26 insertions, 8 deletions

diff --git a/src/nids.h b/src/nids.h
index e364289..cdefdcb 100644
--- a/src/nids.h
+++ b/src/nids.h
@@ -3,12 +3,15 @@
 
 #include <stdint.h>
 #include "bu/bitstring.h"
+#include "bu/exceptionbase.h"
 
 namespace Bu
 {
         class Stream;
         class NidsStream;
 
+        subExceptionDecl( NidsException )
+
         /**
          * Numerically Indexed Data Streams.  This is a working name so I can
          * actually get some code written instead of agonizing over the name.
@@ -24,6 +27,14 @@ namespace Bu
                 virtual ~Nids();
 
                 /**
+                 * Initialize this object based on the data already in the assosiated
+                 * stream.  This will be called automatically for you if you forget,
+                 * but if you want to pre-initialize for some reason, just call this
+                 * once before you actually start doing anything with your Nids.
+                 */
+                void initialize();
+
+                /**
                  * Create a new Nids system in the assosiated stream.  This should be
                  * used carefully, it will destroy all data already within the stream.
                  * More options will probably be added soon.
@@ -46,14 +57,16 @@ namespace Bu
                  */
                 NidsStream openStream( int iID );
 
+                int getBlockSize();
+
         private:
                 typedef struct Block
                 {
-                        uint32_t iFirstBlock;
-                        uint32_t iNextBlock;
-                        uint32_t iPrevBlock;
-                        uint32_t iBytesUsed;
-                        uint32_t iReserved;
+                        uint32_t uFirstBlock;
+                        uint32_t uNextBlock;
+                        uint32_t uPrevBlock;
+                        uint32_t uBytesUsed;
+                        uint32_t uReserved;
                         unsigned char pData[0];
                 } Block;
 
@@ -62,9 +75,14 @@ namespace Bu
                         blockUnused     =       0xFFFFFFFFUL
                 };
 
-                void extendStream( int iID, int iBlockCount=1 );
-                void getBlock( int iIndex, struct Nids::Block *pBlock );
-                void setBlock( int iIndex, struct Nids::Block *pBlock );
+                uint32_t createBlock( uint32_t uFirstBlock, uint32_t uPrevBlock,
+                        int iPreAllocate=1 );
+                void getBlock( uint32_t uIndex, struct Nids::Block *pBlock );
+                void setBlock( uint32_t uIndex, struct Nids::Block *pBlock );
+                void updateStreamSize( uint32_t uIndex, uint32_t uSize );
+                uint32_t getNextBlock( uint32_t uIndex, struct Nids::Block *pBlock );
+                Block *newBlock();
+                void deleteBlock( Block *pBlock );
 
         private:
                 Bu::Stream &sStore;