From 4114863a941ac974385ec401d35dddb22641103b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Sat, 6 Aug 2016 08:21:14 +0200 Subject: [PATCH] Duplicate error logging removed --- lib/EAPBase/include/Module.h | 4 ++-- lib/TTLS/src/Module.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index 243a570..c2a5d38 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -620,7 +620,7 @@ namespace eap *pdwDataOutSize = (DWORD)data_enc.size(); *ppDataOut = alloc_memory(*pdwDataOutSize); if (!*ppDataOut) { - log_error(*ppEapError = make_error(ERROR_OUTOFMEMORY, winstd::wstring_printf(_T(__FUNCTION__) _T(" Error allocating memory for BLOB (%uB)."), *pdwDataOutSize).c_str())); + *ppEapError = make_error(ERROR_OUTOFMEMORY, winstd::wstring_printf(_T(__FUNCTION__) _T(" Error allocating memory for BLOB (%uB)."), *pdwDataOutSize).c_str()); return false; } memcpy(*ppDataOut, data_enc.data(), *pdwDataOutSize); @@ -629,7 +629,7 @@ namespace eap *pdwDataOutSize = (DWORD)pksizeof(record); *ppDataOut = alloc_memory(*pdwDataOutSize); if (!*ppDataOut) { - log_error(*ppEapError = make_error(ERROR_OUTOFMEMORY, winstd::wstring_printf(_T(__FUNCTION__) _T(" Error allocating memory for BLOB (%uB)."), *pdwDataOutSize).c_str())); + *ppEapError = make_error(ERROR_OUTOFMEMORY, winstd::wstring_printf(_T(__FUNCTION__) _T(" Error allocating memory for BLOB (%uB)."), *pdwDataOutSize).c_str()); return false; } diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 1b5d78c..d789f2d 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -328,7 +328,7 @@ bool eap::peer_ttls::begin_session( // Allocate new session. unique_ptr session(new session_ttls(*this)); if (!session) { - log_error(*ppEapError = make_error(ERROR_OUTOFMEMORY, _T(__FUNCTION__) _T(" Error allocating memory for EAP-TTLS session."))); + *ppEapError = make_error(ERROR_OUTOFMEMORY, _T(__FUNCTION__) _T(" Error allocating memory for EAP-TTLS session.")); return false; }