Cppcheck fixes:

* reduce variable scope
* remove unneeded variable assignments

1 files changed, 4 insertions, 3 deletions

diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp
index 423fa2062..2704c7eb0 100644
--- a/src/DSUtil/DSUtil.cpp
+++ b/src/DSUtil/DSUtil.cpp
@@ -795,9 +795,10 @@ void CStringToBin(CString str, CAtlArray<BYTE>& data)
 CString BinToCString(const BYTE* ptr, size_t len)

 {

     CString ret;

-    TCHAR high, low;

 

     while (len-- > 0) {

+        TCHAR high, low;

+

         high = (*ptr >> 4) >= 10 ? (*ptr >> 4) - 10 + _T('A') : (*ptr >> 4) + _T('0');

         low = (*ptr & 0xf) >= 10 ? (*ptr & 0xf) - 10 + _T('A') : (*ptr & 0xf) + _T('0');

 

@@ -2756,10 +2757,10 @@ void HexDump(CString fileName, BYTE* buf, int size)
 

     CString dump_str;

     dump_str.Format(_T("Dump size = %d\n"), size);

-    int len, i, j, c;

+    int i, j, c;

 

     for (i = 0; i < size; i += 16) {

-        len = size - i;

+        int len = size - i;

         if (len > 16) {

             len = 16;

         }