From 601692999d3328204c99550058a51c5a33755565 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 29 Aug 2011 10:24:03 +0200 Subject: [PATCH] Silence some wrong compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For every available module call implementation, we got this: Modules.cpp: In member function ‘bool CModules::OnGetAvailableMods(std::__debug::set&, CModInfo::EModuleType)’: Modules.cpp:149:72: error: ‘pNetwork’ may be used uninitialized in this function [-Werror=uninitialized] Modules.cpp:808:260: note: ‘pNetwork’ was declared here Modules.cpp:148:54: error: ‘pOldUser’ may be used uninitialized in this function [-Werror=uninitialized] Modules.cpp:808:168: note: ‘pOldUser’ was declared here I guess GCC saw that m_pNetwork and m_pUser could be changed by the module call to a non-NULL value which means we would really use an uninitialized value... Signed-off-by: Uli Schlachter --- Modules.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index 12f750b6..f4fa81a2 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -26,12 +26,12 @@ CModule* pMod = (CModule *) (*this)[a]; \ CClient* pOldClient = pMod->GetClient(); \ pMod->SetClient(m_pClient); \ - CUser* pOldUser; \ + CUser* pOldUser = NULL; \ if (m_pUser) { \ pOldUser = pMod->GetUser(); \ pMod->SetUser(m_pUser); \ } \ - CIRCNetwork* pNetwork; \ + CIRCNetwork* pNetwork = NULL; \ if (m_pNetwork) { \ pNetwork = pMod->GetNetwork(); \ pMod->SetNetwork(m_pNetwork); \ @@ -58,12 +58,12 @@ CModule::EModRet e = CModule::CONTINUE; \ CClient* pOldClient = pMod->GetClient(); \ pMod->SetClient(m_pClient); \ - CUser* pOldUser; \ + CUser* pOldUser = NULL; \ if (m_pUser) { \ pOldUser = pMod->GetUser(); \ pMod->SetUser(m_pUser); \ } \ - CIRCNetwork* pNetwork; \ + CIRCNetwork* pNetwork = NULL; \ if (m_pNetwork) { \ pNetwork = pMod->GetNetwork(); \ pMod->SetNetwork(m_pNetwork); \