1 files changed, 16 insertions, 15 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/SetProperties.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/SetProperties.cpp
index 4827f2a78..64b9d92a6 100644
--- a/src/libs/7zip/win/CPP/7zip/UI/Common/SetProperties.cpp
+++ b/src/libs/7zip/win/CPP/7zip/UI/Common/SetProperties.cpp
@@ -2,25 +2,26 @@
 
 #include "StdAfx.h"
 
-#include "SetProperties.h"
+#include "../../../Common/MyCom.h"
+#include "../../../Common/MyString.h"
+#include "../../../Common/StringToInt.h"
 
-#include "Windows/PropVariant.h"
-#include "Common/MyString.h"
-#include "Common/StringToInt.h"
-#include "Common/MyCom.h"
+#include "../../../Windows/PropVariant.h"
 
 #include "../../Archive/IArchive.h"
 
+#include "SetProperties.h"
+
 using namespace NWindows;
 using namespace NCOM;
 
 static void ParseNumberString(const UString &s, NCOM::CPropVariant &prop)
 {
-  const wchar_t *endPtr;
-  UInt64 result = ConvertStringToUInt64(s, &endPtr);
-  if (endPtr - (const wchar_t *)s != s.Length())
+  const wchar_t *end;
+  UInt64 result = ConvertStringToUInt64(s, &end);
+  if (*end != 0 || s.IsEmpty())
     prop = s;
-  else if (result <= 0xFFFFFFFF)
+  else if (result <= (UInt32)0xFFFFFFFF)
     prop = (UInt32)result;
   else
     prop = result;
@@ -39,8 +40,8 @@ HRESULT SetProperties(IUnknown *unknown, const CObjectVector<CProperty> &propert
   CPropVariant *values = new CPropVariant[properties.Size()];
   try
   {
-    int i;
-    for(i = 0; i < properties.Size(); i++)
+    unsigned i;
+    for (i = 0; i < properties.Size(); i++)
     {
       const CProperty &property = properties[i];
       NCOM::CPropVariant propVariant;
@@ -49,13 +50,13 @@ HRESULT SetProperties(IUnknown *unknown, const CObjectVector<CProperty> &propert
       {
         if (!name.IsEmpty())
         {
-          wchar_t c = name[name.Length() - 1];
+          wchar_t c = name.Back();
           if (c == L'-')
             propVariant = false;
           else if (c == L'+')
             propVariant = true;
           if (propVariant.vt != VT_EMPTY)
-            name = name.Left(name.Length() - 1);
+            name.DeleteBack();
         }
       }
       else
@@ -64,9 +65,9 @@ HRESULT SetProperties(IUnknown *unknown, const CObjectVector<CProperty> &propert
       values[i] = propVariant;
     }
     CRecordVector<const wchar_t *> names;
-    for(i = 0; i < realNames.Size(); i++)
+    for (i = 0; i < realNames.Size(); i++)
       names.Add((const wchar_t *)realNames[i]);
-    
+
     RINOK(setProperties->SetProperties(&names.Front(), values, names.Size()));
   }
   catch(...)