diff options
author | Shauren <shauren.trinity@gmail.com> | 2019-08-10 19:01:24 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2019-08-10 19:01:24 +0200 |
commit | cd720efbfa60f434f420ab66e220eca742c48e45 (patch) | |
tree | 3c960ac5249d0711b71fbfdc62f6c0b665ed85ee /dep/CascLib/src/common/Csv.cpp | |
parent | 0d6320dfd3932865edb69c8528327b767bd476ef (diff) |
Dep/CascLib: Update to ladislav-zezula/CascLib@b91f87c770c78340dcd96df970e55b5c0469e884
Diffstat (limited to 'dep/CascLib/src/common/Csv.cpp')
-rw-r--r-- | dep/CascLib/src/common/Csv.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dep/CascLib/src/common/Csv.cpp b/dep/CascLib/src/common/Csv.cpp index 24b654daa86..c665fc00c4c 100644 --- a/dep/CascLib/src/common/Csv.cpp +++ b/dep/CascLib/src/common/Csv.cpp @@ -185,10 +185,10 @@ CASC_CSV::~CASC_CSV() m_szCsvFile = NULL; } -int CASC_CSV::Load(const TCHAR * szFileName) +DWORD CASC_CSV::Load(const TCHAR * szFileName) { DWORD cbFileData = 0; - int nError = ERROR_SUCCESS; + DWORD dwErrCode = ERROR_SUCCESS; m_szCsvFile = (char *)LoadFileToMemory(szFileName, &cbFileData); if (m_szCsvFile != NULL) @@ -199,19 +199,19 @@ int CASC_CSV::Load(const TCHAR * szFileName) m_nCsvFile = cbFileData; // Parse the data - nError = ParseCsvData() ? ERROR_SUCCESS : ERROR_BAD_FORMAT; + dwErrCode = ParseCsvData() ? ERROR_SUCCESS : ERROR_BAD_FORMAT; } else { - nError = GetLastError(); + dwErrCode = GetLastError(); } - return nError; + return dwErrCode; } -int CASC_CSV::Load(LPBYTE pbData, size_t cbData) +DWORD CASC_CSV::Load(LPBYTE pbData, size_t cbData) { - int nError = ERROR_NOT_ENOUGH_MEMORY; + DWORD dwErrCode = ERROR_NOT_ENOUGH_MEMORY; m_szCsvFile = new char[cbData + 1]; if (m_szCsvFile != NULL) @@ -223,10 +223,10 @@ int CASC_CSV::Load(LPBYTE pbData, size_t cbData) m_nCsvFile = cbData; // Parse the data - nError = ParseCsvData() ? ERROR_SUCCESS : ERROR_BAD_FORMAT; + dwErrCode = ParseCsvData() ? ERROR_SUCCESS : ERROR_BAD_FORMAT; } - return nError; + return dwErrCode; } bool CASC_CSV::LoadNextLine() |