react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/CreateCoder.cpp

@@ -11,23 +11,19 @@
 #include "RegisterCodec.h"
 
 static const unsigned kNumCodecsMax = 64;
-extern
-unsigned g_NumCodecs;
 unsigned g_NumCodecs = 0;
-extern
-const CCodecInfo *g_Codecs[];
 const CCodecInfo *g_Codecs[kNumCodecsMax];
 
 // We use g_ExternalCodecs in other stages.
-#ifdef Z7_EXTERNAL_CODECS
 /*
+#ifdef EXTERNAL_CODECS
 extern CExternalCodecs g_ExternalCodecs;
 #define CHECK_GLOBAL_CODECS \
-    if (!_externalCodecs || !_externalCodecs->IsSet()) _externalCodecs = &g_ExternalCodecs;
-*/
-#define CHECK_GLOBAL_CODECS
+    if (!__externalCodecs || !__externalCodecs->IsSet()) __externalCodecs = &g_ExternalCodecs;
 #endif
+*/
 
+#define CHECK_GLOBAL_CODECS
 
 void RegisterCodec(const CCodecInfo *codecInfo) throw()
 {
@@ -35,12 +31,8 @@ void RegisterCodec(const CCodecInfo *codecInfo) throw()
     g_Codecs[g_NumCodecs++] = codecInfo;
 }
 
-static const unsigned kNumHashersMax = 32;
-extern
-unsigned g_NumHashers;
+static const unsigned kNumHashersMax = 16;
 unsigned g_NumHashers = 0;
-extern
-const CHasherInfo *g_Hashers[];
 const CHasherInfo *g_Hashers[kNumHashersMax];
 
 void RegisterHasher(const CHasherInfo *hashInfo) throw()
@@ -50,12 +42,12 @@ void RegisterHasher(const CHasherInfo *hashInfo) throw()
 }
 
 
-#ifdef Z7_EXTERNAL_CODECS
+#ifdef EXTERNAL_CODECS
 
 static HRESULT ReadNumberOfStreams(ICompressCodecsInfo *codecsInfo, UInt32 index, PROPID propID, UInt32 &res)
 {
   NWindows::NCOM::CPropVariant prop;
-  RINOK(codecsInfo->GetProperty(index, propID, &prop))
+  RINOK(codecsInfo->GetProperty(index, propID, &prop));
   if (prop.vt == VT_EMPTY)
     res = 1;
   else if (prop.vt == VT_UI4)
@@ -68,7 +60,7 @@ static HRESULT ReadNumberOfStreams(ICompressCodecsInfo *codecsInfo, UInt32 index
 static HRESULT ReadIsAssignedProp(ICompressCodecsInfo *codecsInfo, UInt32 index, PROPID propID, bool &res)
 {
   NWindows::NCOM::CPropVariant prop;
-  RINOK(codecsInfo->GetProperty(index, propID, &prop))
+  RINOK(codecsInfo->GetProperty(index, propID, &prop));
   if (prop.vt == VT_EMPTY)
     res = true;
   else if (prop.vt == VT_BOOL)
@@ -89,13 +81,13 @@ HRESULT CExternalCodecs::Load()
     
     UString s;
     UInt32 num;
-    RINOK(GetCodecs->GetNumMethods(&num))
+    RINOK(GetCodecs->GetNumMethods(&num));
     
     for (UInt32 i = 0; i < num; i++)
     {
       NWindows::NCOM::CPropVariant prop;
       
-      RINOK(GetCodecs->GetProperty(i, NMethodPropID::kID, &prop))
+      RINOK(GetCodecs->GetProperty(i, NMethodPropID::kID, &prop));
       if (prop.vt != VT_UI8)
         continue; // old Interface
       info.Id = prop.uhVal.QuadPart;
@@ -103,22 +95,21 @@ HRESULT CExternalCodecs::Load()
       prop.Clear();
       
       info.Name.Empty();
-      RINOK(GetCodecs->GetProperty(i, NMethodPropID::kName, &prop))
+      RINOK(GetCodecs->GetProperty(i, NMethodPropID::kName, &prop));
       if (prop.vt == VT_BSTR)
         info.Name.SetFromWStr_if_Ascii(prop.bstrVal);
       else if (prop.vt != VT_EMPTY)
         continue;
       
-      RINOK(ReadNumberOfStreams(GetCodecs, i, NMethodPropID::kPackStreams, info.NumStreams))
+      RINOK(ReadNumberOfStreams(GetCodecs, i, NMethodPropID::kPackStreams, info.NumStreams));
       {
         UInt32 numUnpackStreams = 1;
-        RINOK(ReadNumberOfStreams(GetCodecs, i, NMethodPropID::kUnpackStreams, numUnpackStreams))
+        RINOK(ReadNumberOfStreams(GetCodecs, i, NMethodPropID::kUnpackStreams, numUnpackStreams));
         if (numUnpackStreams != 1)
           continue;
       }
-      RINOK(ReadIsAssignedProp(GetCodecs, i, NMethodPropID::kEncoderIsAssigned, info.EncoderIsAssigned))
-      RINOK(ReadIsAssignedProp(GetCodecs, i, NMethodPropID::kDecoderIsAssigned, info.DecoderIsAssigned))
-      RINOK(ReadIsAssignedProp(GetCodecs, i, NMethodPropID::kIsFilter, info.IsFilter))
+      RINOK(ReadIsAssignedProp(GetCodecs, i, NMethodPropID::kEncoderIsAssigned, info.EncoderIsAssigned));
+      RINOK(ReadIsAssignedProp(GetCodecs, i, NMethodPropID::kDecoderIsAssigned, info.DecoderIsAssigned));
       
       Codecs.Add(info);
     }
@@ -133,7 +124,7 @@ HRESULT CExternalCodecs::Load()
     {
       NWindows::NCOM::CPropVariant prop;
 
-      RINOK(GetHashers->GetHasherProp(i, NMethodPropID::kID, &prop))
+      RINOK(GetHashers->GetHasherProp(i, NMethodPropID::kID, &prop));
       if (prop.vt != VT_UI8)
         continue;
       info.Id = prop.uhVal.QuadPart;
@@ -141,7 +132,7 @@ HRESULT CExternalCodecs::Load()
       prop.Clear();
       
       info.Name.Empty();
-      RINOK(GetHashers->GetHasherProp(i, NMethodPropID::kName, &prop))
+      RINOK(GetHashers->GetHasherProp(i, NMethodPropID::kName, &prop));
       if (prop.vt == VT_BSTR)
         info.Name.SetFromWStr_if_Ascii(prop.bstrVal);
       else if (prop.vt != VT_EMPTY)
@@ -162,8 +153,7 @@ int FindMethod_Index(
     const AString &name,
     bool encode,
     CMethodId &methodId,
-    UInt32 &numStreams,
-    bool &isFilter)
+    UInt32 &numStreams)
 {
   unsigned i;
   for (i = 0; i < g_NumCodecs; i++)
@@ -174,26 +164,24 @@ int FindMethod_Index(
     {
       methodId = codec.Id;
       numStreams = codec.NumStreams;
-      isFilter = codec.IsFilter;
-      return (int)i;
+      return i;
     }
   }
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
   
   CHECK_GLOBAL_CODECS
 
-  if (_externalCodecs)
-    for (i = 0; i < _externalCodecs->Codecs.Size(); i++)
+  if (__externalCodecs)
+    for (i = 0; i < __externalCodecs->Codecs.Size(); i++)
     {
-      const CCodecInfoEx &codec = _externalCodecs->Codecs[i];
+      const CCodecInfoEx &codec = __externalCodecs->Codecs[i];
       if ((encode ? codec.EncoderIsAssigned : codec.DecoderIsAssigned)
           && StringsAreEqualNoCase_Ascii(name, codec.Name))
       {
         methodId = codec.Id;
         numStreams = codec.NumStreams;
-        isFilter = codec.IsFilter;
-        return (int)(g_NumCodecs + i);
+        return g_NumCodecs + i;
       }
     }
   
@@ -212,19 +200,19 @@ static int FindMethod_Index(
   {
     const CCodecInfo &codec = *g_Codecs[i];
     if (codec.Id == methodId && (encode ? codec.CreateEncoder : codec.CreateDecoder))
-      return (int)i;
+      return i;
   }
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
   
   CHECK_GLOBAL_CODECS
 
-  if (_externalCodecs)
-    for (i = 0; i < _externalCodecs->Codecs.Size(); i++)
+  if (__externalCodecs)
+    for (i = 0; i < __externalCodecs->Codecs.Size(); i++)
     {
-      const CCodecInfoEx &codec = _externalCodecs->Codecs[i];
+      const CCodecInfoEx &codec = __externalCodecs->Codecs[i];
       if (codec.Id == methodId && (encode ? codec.EncoderIsAssigned : codec.DecoderIsAssigned))
-        return (int)(g_NumCodecs + i);
+        return g_NumCodecs + i;
     }
   
   #endif
@@ -251,14 +239,14 @@ bool FindMethod(
     }
   }
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
 
   CHECK_GLOBAL_CODECS
 
-  if (_externalCodecs)
-    for (i = 0; i < _externalCodecs->Codecs.Size(); i++)
+  if (__externalCodecs)
+    for (i = 0; i < __externalCodecs->Codecs.Size(); i++)
     {
-      const CCodecInfoEx &codec = _externalCodecs->Codecs[i];
+      const CCodecInfoEx &codec = __externalCodecs->Codecs[i];
       if (methodId == codec.Id)
       {
         name = codec.Name;
@@ -287,14 +275,14 @@ bool FindHashMethod(
     }
   }
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
 
   CHECK_GLOBAL_CODECS
 
-  if (_externalCodecs)
-    for (i = 0; i < _externalCodecs->Hashers.Size(); i++)
+  if (__externalCodecs)
+    for (i = 0; i < __externalCodecs->Hashers.Size(); i++)
     {
-      const CHasherInfoEx &codec = _externalCodecs->Hashers[i];
+      const CHasherInfoEx &codec = __externalCodecs->Hashers[i];
       if (StringsAreEqualNoCase_Ascii(name, codec.Name))
       {
         methodId = codec.Id;
@@ -316,13 +304,13 @@ void GetHashMethods(
   for (i = 0; i < g_NumHashers; i++)
     methods[i] = (*g_Hashers[i]).Id;
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
   
   CHECK_GLOBAL_CODECS
 
-  if (_externalCodecs)
-    for (i = 0; i < _externalCodecs->Hashers.Size(); i++)
-      methods.Add(_externalCodecs->Hashers[i].Id);
+  if (__externalCodecs)
+    for (i = 0; i < __externalCodecs->Hashers.Size(); i++)
+      methods.Add(__externalCodecs->Hashers[i].Id);
   
   #endif
 }
@@ -367,17 +355,17 @@ HRESULT CreateCoder_Index(
     }
   }
 
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
 
   CHECK_GLOBAL_CODECS
   
-  if (_externalCodecs)
+  if (__externalCodecs)
   {
     i -= g_NumCodecs;
     cod.IsExternal = true;
-    if (i < _externalCodecs->Codecs.Size())
+    if (i < __externalCodecs->Codecs.Size())
     {
-      const CCodecInfoEx &codec = _externalCodecs->Codecs[i];
+      const CCodecInfoEx &codec = __externalCodecs->Codecs[i];
       // if (codec.Id == methodId)
       {
         if (encode)
@@ -386,15 +374,15 @@ HRESULT CreateCoder_Index(
           {
             if (codec.NumStreams == 1)
             {
-              const HRESULT res = _externalCodecs->GetCodecs->CreateEncoder(i, &IID_ICompressCoder, (void **)&cod.Coder);
+              HRESULT res = __externalCodecs->GetCodecs->CreateEncoder(i, &IID_ICompressCoder, (void **)&cod.Coder);
               if (res != S_OK && res != E_NOINTERFACE && res != CLASS_E_CLASSNOTAVAILABLE)
                 return res;
               if (cod.Coder)
                 return res;
-              return _externalCodecs->GetCodecs->CreateEncoder(i, &IID_ICompressFilter, (void **)&filter);
+              return __externalCodecs->GetCodecs->CreateEncoder(i, &IID_ICompressFilter, (void **)&filter);
             }
             cod.NumStreams = codec.NumStreams;
-            return _externalCodecs->GetCodecs->CreateEncoder(i, &IID_ICompressCoder2, (void **)&cod.Coder2);
+            return __externalCodecs->GetCodecs->CreateEncoder(i, &IID_ICompressCoder2, (void **)&cod.Coder2);
           }
         }
         else
@@ -402,15 +390,15 @@ HRESULT CreateCoder_Index(
           {
             if (codec.NumStreams == 1)
             {
-              const HRESULT res = _externalCodecs->GetCodecs->CreateDecoder(i, &IID_ICompressCoder, (void **)&cod.Coder);
+              HRESULT res = __externalCodecs->GetCodecs->CreateDecoder(i, &IID_ICompressCoder, (void **)&cod.Coder);
               if (res != S_OK && res != E_NOINTERFACE && res != CLASS_E_CLASSNOTAVAILABLE)
                 return res;
               if (cod.Coder)
                 return res;
-              return _externalCodecs->GetCodecs->CreateDecoder(i, &IID_ICompressFilter, (void **)&filter);
+              return __externalCodecs->GetCodecs->CreateDecoder(i, &IID_ICompressFilter, (void **)&filter);
             }
             cod.NumStreams = codec.NumStreams;
-            return _externalCodecs->GetCodecs->CreateDecoder(i, &IID_ICompressCoder2, (void **)&cod.Coder2);
+            return __externalCodecs->GetCodecs->CreateDecoder(i, &IID_ICompressCoder2, (void **)&cod.Coder2);
           }
       }
     }
@@ -427,7 +415,7 @@ HRESULT CreateCoder_Index(
     CCreatedCoder &cod)
 {
   CMyComPtr<ICompressFilter> filter;
-  const HRESULT res = CreateCoder_Index(
+  HRESULT res = CreateCoder_Index(
       EXTERNAL_CODECS_LOC_VARS
       index, encode,
       filter, cod);
@@ -450,10 +438,10 @@ HRESULT CreateCoder_Id(
     CMyComPtr<ICompressFilter> &filter,
     CCreatedCoder &cod)
 {
-  const int index = FindMethod_Index(EXTERNAL_CODECS_LOC_VARS methodId, encode);
+  int index = FindMethod_Index(EXTERNAL_CODECS_LOC_VARS methodId, encode);
   if (index < 0)
     return S_OK;
-  return CreateCoder_Index(EXTERNAL_CODECS_LOC_VARS (unsigned)index, encode, filter, cod);
+  return CreateCoder_Index(EXTERNAL_CODECS_LOC_VARS index, encode, filter, cod);
 }
 
 
@@ -463,7 +451,7 @@ HRESULT CreateCoder_Id(
     CCreatedCoder &cod)
 {
   CMyComPtr<ICompressFilter> filter;
-  const HRESULT res = CreateCoder_Id(
+  HRESULT res = CreateCoder_Id(
       EXTERNAL_CODECS_LOC_VARS
       methodId, encode,
       filter, cod);
@@ -486,7 +474,7 @@ HRESULT CreateCoder_Id(
     CMyComPtr<ICompressCoder> &coder)
 {
   CCreatedCoder cod;
-  const HRESULT res = CreateCoder_Id(
+  HRESULT res = CreateCoder_Id(
       EXTERNAL_CODECS_LOC_VARS
       methodId, encode,
       cod);
@@ -527,18 +515,18 @@ HRESULT CreateHasher(
     }
   }
 
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
 
   CHECK_GLOBAL_CODECS
 
-  if (!hasher && _externalCodecs)
-    for (i = 0; i < _externalCodecs->Hashers.Size(); i++)
+  if (!hasher && __externalCodecs)
+    for (i = 0; i < __externalCodecs->Hashers.Size(); i++)
     {
-      const CHasherInfoEx &codec = _externalCodecs->Hashers[i];
+      const CHasherInfoEx &codec = __externalCodecs->Hashers[i];
       if (codec.Id == methodId)
       {
         name = codec.Name;
-        return _externalCodecs->GetHashers->CreateHasher((UInt32)i, &hasher);
+        return __externalCodecs->GetHashers->CreateHasher((UInt32)i, &hasher);
       }
     }
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/CreateCoder.h

@@ -1,7 +1,7 @@
 // CreateCoder.h
 
-#ifndef ZIP7_INC_CREATE_CODER_H
-#define ZIP7_INC_CREATE_CODER_H
+#ifndef __CREATE_CODER_H
+#define __CREATE_CODER_H
 
 #include "../../Common/MyCom.h"
 #include "../../Common/MyString.h"
@@ -11,10 +11,10 @@
 #include "MethodId.h"
 
 /*
-  if Z7_EXTERNAL_CODECS is not defined, the code supports only codecs that
+  if EXTERNAL_CODECS is not defined, the code supports only codecs that
       are statically linked at compile-time and link-time.
 
-  if Z7_EXTERNAL_CODECS is defined, the code supports also codecs from another
+  if EXTERNAL_CODECS is defined, the code supports also codecs from another
       executable modules, that can be linked dynamically at run-time:
         - EXE module can use codecs from external DLL files.
         - DLL module can use codecs from external EXE and DLL files.
@@ -26,7 +26,7 @@
     2) External codecs
 */
 
-#ifdef Z7_EXTERNAL_CODECS
+#ifdef EXTERNAL_CODECS
 
 struct CCodecInfoEx
 {
@@ -35,9 +35,8 @@ struct CCodecInfoEx
   UInt32 NumStreams;
   bool EncoderIsAssigned;
   bool DecoderIsAssigned;
-  bool IsFilter; // it's unused
   
-  CCodecInfoEx(): EncoderIsAssigned(false), DecoderIsAssigned(false), IsFilter(false) {}
+  CCodecInfoEx(): EncoderIsAssigned(false), DecoderIsAssigned(false) {}
 };
 
 struct CHasherInfoEx
@@ -46,17 +45,13 @@ struct CHasherInfoEx
   AString Name;
 };
 
-#define Z7_PUBLIC_ISetCompressCodecsInfo_IFEC \
-    public ISetCompressCodecsInfo,
-#define Z7_COM_QI_ENTRY_ISetCompressCodecsInfo_IFEC \
-    Z7_COM_QI_ENTRY(ISetCompressCodecsInfo)
-#define DECL_ISetCompressCodecsInfo \
-    Z7_COM7F_IMP(SetCompressCodecsInfo(ICompressCodecsInfo *compressCodecsInfo))
-#define IMPL_ISetCompressCodecsInfo2(cls) \
-    Z7_COM7F_IMF(cls::SetCompressCodecsInfo(ICompressCodecsInfo *compressCodecsInfo)) \
-    { COM_TRY_BEGIN _externalCodecs.GetCodecs = compressCodecsInfo; \
-    return _externalCodecs.Load(); COM_TRY_END }
-#define IMPL_ISetCompressCodecsInfo  IMPL_ISetCompressCodecsInfo2(CHandler)
+#define PUBLIC_ISetCompressCodecsInfo public ISetCompressCodecsInfo,
+#define QUERY_ENTRY_ISetCompressCodecsInfo MY_QUERYINTERFACE_ENTRY(ISetCompressCodecsInfo)
+#define DECL_ISetCompressCodecsInfo STDMETHOD(SetCompressCodecsInfo)(ICompressCodecsInfo *compressCodecsInfo);
+#define IMPL_ISetCompressCodecsInfo2(x) \
+STDMETHODIMP x::SetCompressCodecsInfo(ICompressCodecsInfo *compressCodecsInfo) { \
+  COM_TRY_BEGIN __externalCodecs.GetCodecs = compressCodecsInfo;  return __externalCodecs.Load(); COM_TRY_END }
+#define IMPL_ISetCompressCodecsInfo IMPL_ISetCompressCodecsInfo2(CHandler)
 
 struct CExternalCodecs
 {
@@ -87,27 +82,26 @@ struct CExternalCodecs
 
 extern CExternalCodecs g_ExternalCodecs;
 
-#define EXTERNAL_CODECS_VARS2   (_externalCodecs.IsSet() ? &_externalCodecs : &g_ExternalCodecs)
-#define EXTERNAL_CODECS_VARS2_L (&_externalCodecs)
+#define EXTERNAL_CODECS_VARS2   (__externalCodecs.IsSet() ? &__externalCodecs : &g_ExternalCodecs)
+#define EXTERNAL_CODECS_VARS2_L (&__externalCodecs)
 #define EXTERNAL_CODECS_VARS2_G (&g_ExternalCodecs)
 
-#define DECL_EXTERNAL_CODECS_VARS CExternalCodecs _externalCodecs;
+#define DECL_EXTERNAL_CODECS_VARS CExternalCodecs __externalCodecs;
 
 #define EXTERNAL_CODECS_VARS   EXTERNAL_CODECS_VARS2,
 #define EXTERNAL_CODECS_VARS_L EXTERNAL_CODECS_VARS2_L,
 #define EXTERNAL_CODECS_VARS_G EXTERNAL_CODECS_VARS2_G,
 
-#define DECL_EXTERNAL_CODECS_LOC_VARS2      const CExternalCodecs *_externalCodecs
-#define DECL_EXTERNAL_CODECS_LOC_VARS       DECL_EXTERNAL_CODECS_LOC_VARS2,
-#define DECL_EXTERNAL_CODECS_LOC_VARS_DECL  DECL_EXTERNAL_CODECS_LOC_VARS2;
+#define DECL_EXTERNAL_CODECS_LOC_VARS2 const CExternalCodecs *__externalCodecs
+#define EXTERNAL_CODECS_LOC_VARS2 __externalCodecs
 
-#define EXTERNAL_CODECS_LOC_VARS2   _externalCodecs
-#define EXTERNAL_CODECS_LOC_VARS    EXTERNAL_CODECS_LOC_VARS2,
+#define DECL_EXTERNAL_CODECS_LOC_VARS DECL_EXTERNAL_CODECS_LOC_VARS2,
+#define EXTERNAL_CODECS_LOC_VARS EXTERNAL_CODECS_LOC_VARS2,
 
 #else
 
-#define Z7_PUBLIC_ISetCompressCodecsInfo_IFEC
-#define Z7_COM_QI_ENTRY_ISetCompressCodecsInfo_IFEC
+#define PUBLIC_ISetCompressCodecsInfo
+#define QUERY_ENTRY_ISetCompressCodecsInfo
 #define DECL_ISetCompressCodecsInfo
 #define IMPL_ISetCompressCodecsInfo
 #define EXTERNAL_CODECS_VARS2
@@ -116,9 +110,8 @@ extern CExternalCodecs g_ExternalCodecs;
 #define EXTERNAL_CODECS_VARS_L
 #define EXTERNAL_CODECS_VARS_G
 #define DECL_EXTERNAL_CODECS_LOC_VARS2
-#define DECL_EXTERNAL_CODECS_LOC_VARS
-#define DECL_EXTERNAL_CODECS_LOC_VARS_DECL
 #define EXTERNAL_CODECS_LOC_VARS2
+#define DECL_EXTERNAL_CODECS_LOC_VARS
 #define EXTERNAL_CODECS_LOC_VARS
 
 #endif
@@ -128,8 +121,7 @@ int FindMethod_Index(
     const AString &name,
     bool encode,
     CMethodId &methodId,
-    UInt32 &numStreams,
-    bool &isFilter);
+    UInt32 &numStreams);
 
 bool FindMethod(
     DECL_EXTERNAL_CODECS_LOC_VARS

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/FilePathAutoRename.cpp

@@ -19,24 +19,24 @@ static bool MakeAutoName(const FString &name,
 
 bool AutoRenamePath(FString &path)
 {
-  const int dotPos = path.ReverseFind_Dot();
-  const int slashPos = path.ReverseFind_PathSepar();
+  int dotPos = path.ReverseFind_Dot();
+  int slashPos = path.ReverseFind_PathSepar();
 
   FString name = path;
   FString extension;
   if (dotPos > slashPos + 1)
   {
-    name.DeleteFrom((unsigned)dotPos);
-    extension = path.Ptr((unsigned)dotPos);
+    name.DeleteFrom(dotPos);
+    extension = path.Ptr(dotPos);
   }
-  name.Add_Char('_');
+  name += '_';
   
   FString temp;
 
-  UInt32 left = 1, right = (UInt32)1 << 30;
+  UInt32 left = 1, right = ((UInt32)1 << 30);
   while (left != right)
   {
-    const UInt32 mid = (left + right) / 2;
+    UInt32 mid = (left + right) / 2;
     if (MakeAutoName(name, extension, mid, temp))
       left = mid + 1;
     else

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/FilePathAutoRename.h

@@ -1,7 +1,7 @@
 // FilePathAutoRename.h
 
-#ifndef ZIP7_INC_FILE_PATH_AUTO_RENAME_H
-#define ZIP7_INC_FILE_PATH_AUTO_RENAME_H
+#ifndef __FILE_PATH_AUTO_RENAME_H
+#define __FILE_PATH_AUTO_RENAME_H
 
 #include "../../Common/MyString.h"