Minor change in BFStream.

[stg.git] / tests / test_bfstream.cpp

diff --git a/tests/test_bfstream.cpp b/tests/test_bfstream.cpp
index 18884d6da48d574f0885a9eabc31e508c8739d52..f80dc8d856cd326c1fb2e086c43f54d6cf191ce4 100644 (file)
--- a/tests/test_bfstream.cpp
+++ b/tests/test_bfstream.cpp
@@ -15,7 +15,7 @@ class TRACKER
     public:
         TRACKER() : m_lastSize(0), m_callCount(0), m_lastBlock(NULL) {}
         ~TRACKER() { delete[] m_lastBlock; }
     public:
         TRACKER() : m_lastSize(0), m_callCount(0), m_lastBlock(NULL) {}
         ~TRACKER() { delete[] m_lastBlock; }

-        void Call(const void * block, size_t size)
+        bool Call(const void * block, size_t size)

         {
         delete[] m_lastBlock;
         if (size > 0)
         {
         delete[] m_lastBlock;
         if (size > 0)


@@ -27,6 +27,7 @@ class TRACKER
             m_lastBlock = NULL;
         m_lastSize = size;
         ++m_callCount;
             m_lastBlock = NULL;
         m_lastSize = size;
         ++m_callCount;

+        return true;

         }
         size_t LastSize() const { return m_lastSize; }
         size_t CallCount() const { return m_callCount; }
         }
         size_t LastSize() const { return m_lastSize; }
         size_t CallCount() const { return m_callCount; }


@@ -38,10 +39,10 @@ class TRACKER
         char * m_lastBlock;
 };
 
         char * m_lastBlock;
 };
 

-void Callback(const void * block, size_t size, void * data)
+bool Callback(const void * block, size_t size, void * data)

 {
 TRACKER & tracker = *static_cast<TRACKER *>(data);
 {
 TRACKER & tracker = *static_cast<TRACKER *>(data);

-tracker.Call(block, size);
+return tracker.Call(block, size);

 }
 
 }
 }
 
 }


@@ -122,6 +123,7 @@ namespace tut
         STG::ENCRYPT_STREAM estream("pr7Hhen", Callback, &tracker);
         std::string source = "This is a test long string for checking stream encryption/decryption. \"abcdefghijklmnopqrstuvwxyz 0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ\"";
         char buffer[source.length() + 9];
         STG::ENCRYPT_STREAM estream("pr7Hhen", Callback, &tracker);
         std::string source = "This is a test long string for checking stream encryption/decryption. \"abcdefghijklmnopqrstuvwxyz 0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ\"";
         char buffer[source.length() + 9];

+        memset(buffer, 0, sizeof(buffer));

 
         estream.Put(source.c_str(), source.length() + 1, true);
         ensure("Encryption long string LastSize()", tracker.LastSize() >= source.length() + 1);
 
         estream.Put(source.c_str(), source.length() + 1, true);
         ensure("Encryption long string LastSize()", tracker.LastSize() >= source.length() + 1);