GNOME.org
 

[dasher: 52/217] Fixed some static analysis warnings

commit 4de87883c784b4d11611a6a5d9e6f51fb5df54ae
Author: ipomoena <amajorek google com>
Date:   Sun Oct 4 21:10:56 2015 -0700

    Fixed some static analysis warnings

 Src/DasherCore/Alphabet/AlphabetMap.cpp            |    4 +-
 Src/DasherCore/AutoSpeedControl.cpp                |    2 +-
 .../LanguageModelling/PPMPYLanguageModel.cpp       |    2 +-
 .../LanguageModelling/WordLanguageModel.cpp        |    2 +-
 Src/DasherCore/Messages.cpp                        |    4 +-
 Src/DasherCore/SocketInputBase.cpp                 |    4 +-
 Src/DasherCore/UserLog.cpp                         |   18 ++---------
 Src/DasherCore/UserLogTrial.cpp                    |   31 ++++++++-----------
 Src/Win32/Dasher.cpp                               |    2 +-
 Src/Win32/DasherWindow.cpp                         |    2 -
 Src/Win32/DasherWindow.h                           |    7 ----
 Src/Win32/Widgets/AlphabetBox.cpp                  |    3 +-
 Src/Win32/Widgets/Canvas.cpp                       |   11 ++-----
 Src/Win32/Widgets/Toolbar.cpp                      |    2 +-
 Src/Win32/Widgets/ViewPage.cpp                     |    5 +--
 15 files changed, 34 insertions(+), 65 deletions(-)
---
diff --git a/Src/DasherCore/Alphabet/AlphabetMap.cpp b/Src/DasherCore/Alphabet/AlphabetMap.cpp
index 266131e..b15b379 100644
--- a/Src/DasherCore/Alphabet/AlphabetMap.cpp
+++ b/Src/DasherCore/Alphabet/AlphabetMap.cpp
@@ -117,7 +117,7 @@ inline int CAlphabetMap::SymbolStream::findNext() {
           char *mbuf(new char[strlen(msg) + 4]);
           sprintf(mbuf, msg, static_cast<unsigned int>(buf[pos] & 0xff), numChars, len-pos);
           m_pMsgs->Message(mbuf,true);
-          delete mbuf;
+          delete[] mbuf;
         }
         return 0;
       }
@@ -128,7 +128,7 @@ inline int CAlphabetMap::SymbolStream::findNext() {
       char *mbuf(new char[strlen(msg) + 2]);
       sprintf(mbuf, msg, static_cast<unsigned int>(buf[pos] & 0xff));
       m_pMsgs->Message(mbuf,true);
-      delete mbuf;
+      delete[] mbuf;
     }
     ++pos;
   }
diff --git a/Src/DasherCore/AutoSpeedControl.cpp b/Src/DasherCore/AutoSpeedControl.cpp
index cb62b81..a9cb1e4 100644
--- a/Src/DasherCore/AutoSpeedControl.cpp
+++ b/Src/DasherCore/AutoSpeedControl.cpp
@@ -201,7 +201,7 @@ void CAutoSpeedControl::SpeedControl(myint iDasherX, myint iDasherY, CDasherView
         char *buf(new char[strlen(msg) + 5]);
         sprintf(buf, msg, (lBitrateTimes100/100.0));
         m_pMsgs->Message(buf,false);
-        delete buf;
+        delete[] buf;
         SetLongParameter(LP_MAX_BITRATE, lBitrateTimes100);
       }
       m_nSpeedCounter = 0;
diff --git a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp 
b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
index 56675f2..434dc0c 100644
--- a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
+++ b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
@@ -232,7 +232,7 @@ void CPPMPYLanguageModel::GetPartProbs(Context context, std::vector<pair<symbol,
       }
     }
   }
-  delete vCounts;
+  delete[] vCounts;
   //code
   //std::cout<<"after lan mod second loop"<<std::endl;
 
diff --git a/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp 
b/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp
index eabf600..5a5207f 100644
--- a/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp
+++ b/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp
@@ -459,7 +459,7 @@ void CWordLanguageModel::CollapseContext(CWordLanguageModel::CWordContext &conte
         delete apNodeCache[i];
 
       }
-      delete apNodeCache;
+      delete[] apNodeCache;
 
     }
 
diff --git a/Src/DasherCore/Messages.cpp b/Src/DasherCore/Messages.cpp
index aced902..f7d3319 100644
--- a/Src/DasherCore/Messages.cpp
+++ b/Src/DasherCore/Messages.cpp
@@ -10,14 +10,14 @@ void CMessageDisplay::FormatMessageWithString(const char *fmt, const char *str)
   char *buf(new char[strlen(fmt)+strlen(str)]);
   sprintf(buf, fmt, str);
   Message(buf, true);
-  delete buf;
+  delete[] buf;
 }
 
 void CMessageDisplay::FormatMessageWith2Strings(const char *fmt, const char *str1, const char *str2) {
   char *buf(new char[strlen(fmt)+strlen(str1)+strlen(str2)]);
   sprintf(buf, fmt, str1, str2);
   Message(buf,true);
-  delete buf;
+  delete[] buf;
 }
 
   //The following implements a varargs version of the above,
diff --git a/Src/DasherCore/SocketInputBase.cpp b/Src/DasherCore/SocketInputBase.cpp
index b747229..5338f3c 100644
--- a/Src/DasherCore/SocketInputBase.cpp
+++ b/Src/DasherCore/SocketInputBase.cpp
@@ -170,7 +170,7 @@ void CSocketInputBase::SetCoordinateLabel( int iWhichCoordinate, const char *Lab
     char *buf(new char[strlen(msg)+strlen(Label)+DASHER_SOCKET_INPUT_MAX_COORDINATE_LABEL_LENGTH]);
     sprintf(buf,msg,Label,DASHER_SOCKET_INPUT_MAX_COORDINATE_LABEL_LENGTH);
     m_pMsgs->Message(buf, true);
-    delete buf;
+    delete[] buf;
   }
   strncpy(coordinateNames[iWhichCoordinate], Label, DASHER_SOCKET_INPUT_MAX_COORDINATE_LABEL_LENGTH);
   SocketDebugMsg("Socket input: set coordinate %d label to '%s'.", iWhichCoordinate,  
coordinateNames[iWhichCoordinate]);
@@ -299,7 +299,7 @@ void CSocketInputBase::ReportErrnoError(const std::string &prefix) {
   char *buf(new char[strlen(msg) + prefix.length() + strlen(e)]);
   sprintf(buf,msg,prefix.c_str(),e);
   m_pMsgs->Message(buf,true);
-  delete buf;
+  delete[] buf;
 }
 
 void CSocketInputBase::SocketDebugMsg(const char *pszFormat, ...) {
diff --git a/Src/DasherCore/UserLog.cpp b/Src/DasherCore/UserLog.cpp
index 947e89e..82d3b99 100644
--- a/Src/DasherCore/UserLog.cpp
+++ b/Src/DasherCore/UserLog.cpp
@@ -737,21 +737,11 @@ void CUserLog::InitMemberVars()
 // Write this objects XML out  
 bool CUserLog::WriteXML()
 {
-  //CFunctionLogger f1("CUserLog::WriteXML", g_pLogger);
+       fstream fout(m_strFilename.c_str(), ios::trunc | ios::out);
+       fout << GetXML();
+       fout.close();
 
-  try
-  {
-    fstream fout(m_strFilename.c_str(), ios::trunc | ios::out);
-    fout << GetXML();
-    fout.close();
-
-    return true;
-
-  } catch (...)
-  {
-    g_pLogger->Log("CUserLog::WriteXML, failed to write file %s", logNORMAL, m_strFilename.c_str());
-    return false;
-  }
+       return true;
 }
 
 // Serializes our data to XML
diff --git a/Src/DasherCore/UserLogTrial.cpp b/Src/DasherCore/UserLogTrial.cpp
index 5ce7a18..9cefb64 100644
--- a/Src/DasherCore/UserLogTrial.cpp
+++ b/Src/DasherCore/UserLogTrial.cpp
@@ -487,31 +487,26 @@ void CUserLogTrial::GetUserTrialInfo()
 
   m_strCurrentTrial = "";
 
-  try
+  if (m_strCurrentTrialFilename.length() > 0)
   {
-    if (m_strCurrentTrialFilename.length() > 0)
-    {
-      fstream fin(m_strCurrentTrialFilename.c_str(), ios::in);       // We want ios::nocreate, but not 
available in .NET 2003, arrgh
+    // We want ios::nocreate, but not available in .NET 2003, arrgh
+    fstream fin(m_strCurrentTrialFilename.c_str(), ios::in);
 
-      // Make sure we successfully opened before we start reading it
-      if (fin.is_open())
+    // Make sure we successfully opened before we start reading it
+    if (fin.is_open())
+    {
+      while (!fin.eof())
       {
-        while(!fin.eof()) 
+        fin.getline(m_szTempBuffer, TEMP_BUFFER_SIZE);
+        if (strlen(m_szTempBuffer) > 0)
         {
-          fin.getline(m_szTempBuffer, TEMP_BUFFER_SIZE);
-          if (strlen(m_szTempBuffer) > 0)
-          {
-            m_strCurrentTrial += "\t\t\t";
-            m_strCurrentTrial += m_szTempBuffer;
-            m_strCurrentTrial += "\n";
-          }        
+          m_strCurrentTrial += "\t\t\t";
+          m_strCurrentTrial += m_szTempBuffer;
+          m_strCurrentTrial += "\n";
         }
-        fin.close();
       }
+      fin.close();
     }
-  } catch (...)
-  {
-    // The application might not be running in which case the read will fail.
   }
 }
 
diff --git a/Src/Win32/Dasher.cpp b/Src/Win32/Dasher.cpp
index 7cf2ce4..aacea66 100644
--- a/Src/Win32/Dasher.cpp
+++ b/Src/Win32/Dasher.cpp
@@ -291,7 +291,7 @@ bool CDasher::SupportsSpeech() {
     }
     m_bAttemptedSpeech = true;
   }
-  return pVoice;
+  return pVoice != 0;
 }
 
 void CDasher::Speak(const string &strText, bool bInterrupt) {
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index 6cd665c..31c1bb1 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -19,8 +19,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "Dasher.h"
-// TODO: Put this in DasherInterfaceBase header?
-#include "../DasherCore/ControlManager.h"
 #include "DasherWindow.h"
 #include "Widgets/AboutBox.h"
 #include "Widgets/Prefs.h"
diff --git a/Src/Win32/DasherWindow.h b/Src/Win32/DasherWindow.h
index 3a652de..9385169 100644
--- a/Src/Win32/DasherWindow.h
+++ b/Src/Win32/DasherWindow.h
@@ -12,19 +12,12 @@
 #include "Widgets/Splitter.h"
 #include "Widgets/StatusControl.h"
 #include "Widgets/Edit.h"
-#include "DasherMouseInput.h"
-#include "AppSettings.h"
-
-#include "../Common/WinOptions.h"
 
 class CToolbar;
 namespace Dasher {
   class CDasher;
 };
 
-// Abstract interfaces to the Dasher engine
-#include "../../DasherCore/DasherInterfaceBase.h"
-
 class CDasherWindow : 
        public ATL::CWindowImpl<CDasherWindow>, 
        public CSplitterOwner 
diff --git a/Src/Win32/Widgets/AlphabetBox.cpp b/Src/Win32/Widgets/AlphabetBox.cpp
index d439291..f606370 100644
--- a/Src/Win32/Widgets/AlphabetBox.cpp
+++ b/Src/Win32/Widgets/AlphabetBox.cpp
@@ -121,7 +121,6 @@ void CAlphabetBox::PopulateList() {
   m_pAppSettings->GetPermittedValues(SP_ALPHABET_ID, AlphabetList);
 
   int iDefaultIndex(-1);
-  int iFallbackIndex(-1);
 
   // Add each string to list box and index each one
   bool SelectionSet = false;
@@ -273,7 +272,7 @@ LRESULT CAlphabetBox::WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM l
       }
       break;
     case IDC_OR_CUSTOM:
-      if(SendMessage(GetDlgItem(m_hwnd, IDC_OR_CUSTOM), BM_GETCHECK, 0, 0 == BST_CHECKED)) {
+      if(SendMessage(GetDlgItem(m_hwnd, IDC_OR_CUSTOM), BM_GETCHECK, 0, 0) == BST_CHECKED) {
         EnableWindow(GetDlgItem(m_hwnd, IDC_OR_LR), TRUE);
         EnableWindow(GetDlgItem(m_hwnd, IDC_OR_RL), TRUE);
         EnableWindow(GetDlgItem(m_hwnd, IDC_OR_TB), TRUE);
diff --git a/Src/Win32/Widgets/Canvas.cpp b/Src/Win32/Widgets/Canvas.cpp
index 8152497..543ea20 100644
--- a/Src/Win32/Widgets/Canvas.cpp
+++ b/Src/Win32/Widgets/Canvas.cpp
@@ -60,8 +60,6 @@ HWND CCanvas::Create(HWND hParent) {
   HWND hWnd = CWindowImpl<CCanvas>::Create(hParent, NULL, NULL, WS_CHILD | WS_VISIBLE , 
0);//WS_EX_CLIENTEDGE);
 
   m_hdc = GetDC();
-  HDC hdc2 = GetDC();
-  HDC hdc3 = GetDC();
 
   // TODO: Check out whether any of this needs to be reimplemented
 
@@ -241,8 +239,9 @@ LRESULT CCanvas::OnKeyUp(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHand
   
   if(iKeyVal != -1) {
     m_pDasherInterface->KeyUp(GetTickCount(), iKeyVal);
-    return 0;
   }
+  return 0;              
+
 
   // TODO: I believe all this is obsolete, but check  
 //   switch(wParam) 
@@ -266,10 +265,6 @@ LRESULT CCanvas::OnKeyUp(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHand
 }
 
 LRESULT CCanvas::OnKeyDown(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-#ifdef _DEBUG
-  TCHAR tmpAutoOffset[128];
-#endif
-  
   bHandled = TRUE;
   
   int iKeyVal(-1);
@@ -279,8 +274,8 @@ LRESULT CCanvas::OnKeyDown(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHa
   
   if(iKeyVal != -1) {
     m_pDasherInterface->KeyDown(GetTickCount(), iKeyVal);
-    return 0;
   }
+  return 0;
 
   // TODO: Also believed to be obsolete
   
diff --git a/Src/Win32/Widgets/Toolbar.cpp b/Src/Win32/Widgets/Toolbar.cpp
index 888f85f..1e6dde1 100644
--- a/Src/Win32/Widgets/Toolbar.cpp
+++ b/Src/Win32/Widgets/Toolbar.cpp
@@ -145,7 +145,7 @@ void CToolbar::CreateToolbar() {
 
   SendMessage(m_hwnd, TB_ADDBUTTONS, iNumButtons, (LPARAM)pButtons);
 
-  delete(pButtons);
+  delete[] pButtons;
 
   int dwBtnSize = SendMessage(m_hwnd, TB_GETBUTTONSIZE, 0,0);
 
diff --git a/Src/Win32/Widgets/ViewPage.cpp b/Src/Win32/Widgets/ViewPage.cpp
index e2ef89a..7850c54 100644
--- a/Src/Win32/Widgets/ViewPage.cpp
+++ b/Src/Win32/Widgets/ViewPage.cpp
@@ -169,7 +169,6 @@ LRESULT CViewPage::WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lPar
         m_CurrentColours = ColourList[CurrentIndex];
       }
       return TRUE;
-      break;
  
   case IDC_DFONT_BUTTON:
     // TODO: Put this in a function
@@ -199,5 +198,5 @@ LRESULT CViewPage::WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lPar
     }
   }
 
-  CPrefsPageBase::WndProc(Window, message, wParam, lParam);
-}
\ No newline at end of file
+  return CPrefsPageBase::WndProc(Window, message, wParam, lParam);
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]