xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-08 22:07:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.28 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-26 00:00:00 +00:00
committed by Kornel Lesiński
parent d66cf2fcf3
commit 32c73adef4
35 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
7zip/Archive/7z/7zMethods.cpp
View File

@@ -160,7 +160,7 @@ bool GetMethodInfo(const UString &name, CMethodInfo2 &methodInfo)
for(int i = 0; i < g_Methods.Size(); i++)
{
const CMethodInfo2 &method = g_Methods[i];
if (method.Name.CollateNoCase(name) == 0)
if (method.Name.CompareNoCase(name) == 0)
{
methodInfo = method;
return true;

16
7zip/Archive/7z/7zUpdate.cpp
View File

@@ -158,7 +158,7 @@ static int CompareFolders(const CFolder &f1, const CFolder &f2)
static int CompareFiles(const CFileItem &f1, const CFileItem &f2)
{
return MyStringCollateNoCase(f1.Name, f2.Name);
return MyStringCompareNoCase(f1.Name, f2.Name);
}
static int CompareFolderRefs(const int *p1, const int *p2, void *param)
@@ -196,12 +196,12 @@ static int CompareEmptyItems(const int *p1, const int *p2, void *param)
{
if (u1.IsAnti != u2.IsAnti)
return (u1.IsAnti ? 1 : -1);
int n = MyStringCollateNoCase(u1.Name, u2.Name);
int n = MyStringCompareNoCase(u1.Name, u2.Name);
return (u1.IsAnti ? (-n) : n);
}
if (u1.IsAnti != u2.IsAnti)
return (u1.IsAnti ? 1 : -1);
return MyStringCollateNoCase(u1.Name, u2.Name);
return MyStringCompareNoCase(u1.Name, u2.Name);
}
struct CRefItem
@@ -253,18 +253,18 @@ static int CompareUpdateItems(const CRefItem *p1, const CRefItem *p2, void *para
{
if (u1.IsAnti != u2.IsAnti)
return (u1.IsAnti ? 1 : -1);
n = MyStringCollateNoCase(u1.Name, u2.Name);
n = MyStringCompareNoCase(u1.Name, u2.Name);
return (u1.IsAnti ? (-n) : n);
}
if (a1.SortByType)
{
RINOZ(MyStringCollateNoCase(u1.Name + a1.ExtensionPos, u2.Name + a2.ExtensionPos));
RINOZ(MyStringCollateNoCase(u1.Name + a1.NamePos, u2.Name + a2.NamePos));
RINOZ(MyStringCompareNoCase(u1.Name + a1.ExtensionPos, u2.Name + a2.ExtensionPos));
RINOZ(MyStringCompareNoCase(u1.Name + a1.NamePos, u2.Name + a2.NamePos));
if (u1.LastWriteTimeIsDefined && u2.LastWriteTimeIsDefined)
RINOZ(CompareFileTime(&u1.LastWriteTime, &u2.LastWriteTime));
RINOZ(MyCompare(u1.Size, u2.Size))
}
return MyStringCollateNoCase(u1.Name, u2.Name);
return MyStringCompareNoCase(u1.Name, u2.Name);
}
struct CSolidGroup
@@ -689,7 +689,7 @@ static HRESULT Update2(
if (numSubFiles == 0)
prevExtension = ext;
else
if (ext.CollateNoCase(prevExtension) != 0)
if (ext.CompareNoCase(prevExtension) != 0)
break;
}
}

2
7zip/Archive/Common/CoderLoader.h
View File

@@ -91,7 +91,7 @@ public:
int FindPath(LPCTSTR filePath)
{
for (int i = 0; i < Pairs.Size(); i++)
if (Pairs[i].Path.CollateNoCase(filePath) == 0)
if (Pairs[i].Path.CompareNoCase(filePath) == 0)
return i;
return -1;
}

8
7zip/Archive/Common/FilterCoder.cpp
View File

@@ -40,7 +40,7 @@ STDMETHODIMP CFilterCoder::Code(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress)
{
Init();
RINOK(Init());
UInt32 bufferPos = 0;
if (_outSizeIsDefined = (outSize != 0))
_outSize = *outSize;
@@ -86,8 +86,7 @@ STDMETHODIMP CFilterCoder::SetOutStream(ISequentialOutStream *outStream)
{
_bufferPos = 0;
_outStream = outStream;
Init();
return S_OK;
return Init();
}
STDMETHODIMP CFilterCoder::ReleaseOutStream()
@@ -164,8 +163,7 @@ STDMETHODIMP CFilterCoder::SetInStream(ISequentialInStream *inStream)
{
_convertedPosBegin = _convertedPosEnd = _bufferPos = 0;
_inStream = inStream;
Init();
return S_OK;
return Init();
}
STDMETHODIMP CFilterCoder::ReleaseInStream()

4
7zip/Archive/Common/FilterCoder.h
View File

@@ -43,11 +43,11 @@ protected:
UInt64 _outSize;
UInt64 _nowPos64;
void Init()
HRESULT Init()
{
Filter->Init();
_nowPos64 = 0;
_outSizeIsDefined = false;
return Filter->Init();
}
CMyComPtr<ICryptoSetPassword> _setPassword;