From a1225f1c1ea260a30c706baad673c132fdaee5a3 Mon Sep 17 00:00:00 2001 From: Zofia Abramowska Date: Tue, 15 Apr 2014 15:36:49 +0200 Subject: [PATCH] Remove dead code Remove unnecessary check on memcpy return and thus unused memory exception type. Change-Id: I95c47cb36cc178b4219bbfa337aa21991cfc0b67 --- src/server/service/password-exception.h | 1 - src/server/service/password-file-buffer.cpp | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/server/service/password-exception.h b/src/server/service/password-exception.h index 7679ebd..99f089c 100644 --- 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 8ce8ade..7263a3e 100644 --- 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; } -- 2.7.4