Amebis/Updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make enum wxHexDecodeMode scoped

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-02-10 14:59:12 +01:00
parent 62a7d4e715
commit e6c51e923f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UpdPublish/main.cpp
View File

@ -227,7 +227,7 @@ int _tmain(int argc, _TCHAR *argv[])
wxMemoryBuffer hashOrig; wxMemoryBuffer hashOrig;
wxString content(elLocaleNote->GetNodeContent()); wxString content(elLocaleNote->GetNodeContent());
size_t len = wxHexDecodedSize(content.length()); size_t len = wxHexDecodedSize(content.length());
size_t res = wxHexDecode(hashOrig.GetWriteBuf(len), len, content, wxHexDecodeMode_SkipWS); size_t res = wxHexDecode(hashOrig.GetWriteBuf(len), len, content, wxHexDecodeMode::SkipWS);
if (res != wxCONV_FAILED) { if (res != wxCONV_FAILED) {
hashOrig.SetDataLen(res); hashOrig.SetDataLen(res);
if (hash.GetDataLen() == hashOrig.GetDataLen() && if (hash.GetDataLen() == hashOrig.GetDataLen() &&

4
Updater/src/chkthread.cpp
View File

@ -334,7 +334,7 @@ bool wxUpdCheckThread::ParseCatalogue(const wxXmlDocument &doc)
// Read the hash. // Read the hash.
wxString content(elLocaleNote->GetNodeContent()); wxString content(elLocaleNote->GetNodeContent());
size_t len = wxHexDecodedSize(content.length()); size_t len = wxHexDecodedSize(content.length());
size_t res = wxHexDecode(hash.GetWriteBuf(len), len, content, wxHexDecodeMode_SkipWS); size_t res = wxHexDecode(hash.GetWriteBuf(len), len, content, wxHexDecodeMode::SkipWS);
if (res != wxCONV_FAILED) if (res != wxCONV_FAILED)
hash.SetDataLen(res); hash.SetDataLen(res);
else else
@ -409,7 +409,7 @@ bool wxUpdCheckThread::ReadUpdatePackageMeta()
if (m_config.Read(wxT("PackageHash"), &str)) { if (m_config.Read(wxT("PackageHash"), &str)) {
// Convert to binary. // Convert to binary.
size_t len = wxHexDecodedSize(str.length()); size_t len = wxHexDecodedSize(str.length());
size_t res = wxHexDecode(m_hash.GetWriteBuf(len), len, str, wxHexDecodeMode_SkipWS); size_t res = wxHexDecode(m_hash.GetWriteBuf(len), len, str, wxHexDecodeMode::SkipWS);
if (res != wxCONV_FAILED) { if (res != wxCONV_FAILED) {
m_hash.SetDataLen(res); m_hash.SetDataLen(res);
return true; return true;