7zHandlerOut.cpp (p7zip_15.14.1_src_all) | : | 7zHandlerOut.cpp (p7zip_16.02_src_all) | ||
---|---|---|---|---|
skipping to change at line 678 | skipping to change at line 678 | |||
return archive.WriteDatabase(EXTERNAL_CODECS_VARS | return archive.WriteDatabase(EXTERNAL_CODECS_VARS | |||
newDatabase, options.HeaderMethod, options.HeaderOptions); | newDatabase, options.HeaderMethod, options.HeaderOptions); | |||
COM_TRY_END | COM_TRY_END | |||
} | } | |||
static HRESULT ParseBond(UString &srcString, UInt32 &coder, UInt32 &stream) | static HRESULT ParseBond(UString &srcString, UInt32 &coder, UInt32 &stream) | |||
{ | { | |||
stream = 0; | stream = 0; | |||
int index = ParseStringToUInt32(srcString, coder); | { | |||
if (index == 0) | unsigned index = ParseStringToUInt32(srcString, coder); | |||
return E_INVALIDARG; | if (index == 0) | |||
srcString.DeleteFrontal(index); | return E_INVALIDARG; | |||
srcString.DeleteFrontal(index); | ||||
} | ||||
if (srcString[0] == 's') | if (srcString[0] == 's') | |||
{ | { | |||
srcString.Delete(0); | srcString.Delete(0); | |||
int index = ParseStringToUInt32(srcString, stream); | unsigned index = ParseStringToUInt32(srcString, stream); | |||
if (index == 0) | if (index == 0) | |||
return E_INVALIDARG; | return E_INVALIDARG; | |||
srcString.DeleteFrontal(index); | srcString.DeleteFrontal(index); | |||
} | } | |||
return S_OK; | return S_OK; | |||
} | } | |||
void COutHandler::InitProps() | void COutHandler::InitProps() | |||
{ | { | |||
CMultiMethodProps::Init(); | CMultiMethodProps::Init(); | |||
End of changes. 2 change blocks. | ||||
5 lines changed or deleted | 7 lines changed or added |