4.28 beta

7zip/UI/Common/ArchiveCommandLine.cpp

@@ -412,7 +412,7 @@ static void ConvertToLongNames(const UString &prefix, NWildcard::CCensorNode &no
     for (int j = i + 1; j < node.SubNodes.Size();)
     {
       const NWildcard::CCensorNode &nextNode2 = node.SubNodes[j];
-      if (nextNode1.Name.CollateNoCase(nextNode2.Name) == 0)
+      if (nextNode1.Name.CompareNoCase(nextNode2.Name) == 0)
       {
         nextNode1.IncludeItems += nextNode2.IncludeItems;
         nextNode1.ExcludeItems += nextNode2.ExcludeItems;

7zip/UI/Common/ArchiveExtractCallback.cpp

@@ -191,7 +191,7 @@ STDMETHODIMP CArchiveExtractCallback::GetStream(UInt32 index,
         if(pathParts.Size() <= numRemovePathParts)
           return E_FAIL;
         for(int i = 0; i < numRemovePathParts; i++)
-          if(_removePathParts[i].CollateNoCase(pathParts[i]) != 0)
+          if(_removePathParts[i].CompareNoCase(pathParts[i]) != 0)
             return E_FAIL;
         pathParts.Delete(0, numRemovePathParts);
         processedPath = MakePathNameFromParts(pathParts);

7zip/UI/Common/ArchiverInfo.h

@@ -32,7 +32,7 @@ struct CArchiverInfo
   int FindExtension(const UString &ext) const
   {
     for (int i = 0; i < Extensions.Size(); i++)
-      if (ext.CollateNoCase(Extensions[i].Ext) == 0)
+      if (ext.CompareNoCase(Extensions[i].Ext) == 0)
         return i;
     return -1;
   }

7zip/UI/Common/DefaultName.cpp

@@ -15,7 +15,7 @@ UString GetDefaultName2(const UString &fileName,
   {
     int dotPos = fileNameLength - (extLength + 1);
     if (fileName[dotPos] == '.')
-      if (extension.CollateNoCase(fileName.Mid(dotPos + 1)) == 0)
+      if (extension.CompareNoCase(fileName.Mid(dotPos + 1)) == 0)
         return fileName.Left(dotPos) + addSubExtension;
   }
   return kEmptyFileAlias;

7zip/UI/Common/UpdatePair.cpp

@@ -54,7 +54,7 @@ static inline int MyFileNameCompare(const UString &s1, const UString &s2)
 {
   return 
   #ifdef _WIN32
-  s1.CollateNoCase(s2);
+  s1.CompareNoCase(s2);
   #else
   s1.Compare(s2);
   #endif