Remove dead code

Remove unnecessary check on memcpy return and thus unused
memory exception type.

Change-Id: I95c47cb36cc178b4219bbfa337aa21991cfc0b67

diff --git a/src/server/service/password-exception.h b/src/server/service/password-exception.h
index 7679ebd1068ddcf9fc64dcf2129edf144582cd3b..99f089c8bcda959760f52ffec69dcca15b1d7572 100644 (file)
--- a/src/server/service/password-exception.h
+++ b/src/server/service/password-exception.h
@@ -38,7 +38,6 @@ namespace SecurityServer
         DECLARE_EXCEPTION_TYPE(Base, FStreamOpenError)
         DECLARE_EXCEPTION_TYPE(Base, FStreamWriteError)
         DECLARE_EXCEPTION_TYPE(Base, FStreamReadError)
-        DECLARE_EXCEPTION_TYPE(Base, MemoryError)
         DECLARE_EXCEPTION_TYPE(Base, NoPasswords)
         DECLARE_EXCEPTION_TYPE(Base, PasswordNotActive)
         DECLARE_EXCEPTION_TYPE(Base, MakeDirError)

diff --git a/src/server/service/password-file-buffer.cpp b/src/server/service/password-file-buffer.cpp
index 8ce8adeac65bef3fc431a84ff027a9506a703f9e..7263a3e81dd419f85dd7e858000b42aaf2960c26 100644 (file)
--- a/src/server/service/password-file-buffer.cpp
+++ b/src/server/service/password-file-buffer.cpp
@@ -53,12 +53,7 @@ namespace SecurityServer
             Throw(PasswordException::OutOfData);
         }
 
-        void* ret = memcpy(bytes, &m_buffer[m_bufferReadBytes], num);
-
-        if(ret == 0) {
-            LogError("Failed to read " << num << " bytes.");
-            Throw(PasswordException::MemoryError);
-        }
+        memcpy(bytes, &m_buffer[m_bufferReadBytes], num);
 
         m_bufferReadBytes += num;
     }