Refactor: make the read function simpler

7 years ago · 9db9d6215f
parent acb11535cb
commit 9db9d6215f
1 changed files with 5 additions and 7 deletions
--- a/src/streams.h
+++ b/src/streams.h
@ -345,18 +345,16 @@ public:

        // Read from the beginning of the buffer
        unsigned int nReadPosNext = nReadPos + nSize;
-        if (nReadPosNext >= vch.size())
-        {
-            if (nReadPosNext > vch.size())
-            {
+        if (nReadPosNext > vch.size()) {
            throw std::ios_base::failure("CDataStream::read(): end of data");
        }
        memcpy(pch, &vch[nReadPos], nSize);        
+        if (nReadPosNext == vch.size())
+        {
            nReadPos = 0;
            vch.clear();
            return;
        }
-        memcpy(pch, &vch[nReadPos], nSize);
        nReadPos = nReadPosNext;
    }