diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-03 14:05:33 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-03 14:05:33 +0300 |
| commit | 2f880bda3aa2d8817ce43481df9d99b12ed82a58 (patch) | |
| tree | d92de519c6bc13e0ce3d8e42ba64deeb46d474dc /protocols/EmLanProto/src/mlan.cpp | |
| parent | 66b61f42871089f3962920924f9030cd6dff2ad8 (diff) | |
code cleaning: old unions replaced with MAllStrings & MAllStringsArray
Diffstat (limited to 'protocols/EmLanProto/src/mlan.cpp')
| -rw-r--r-- | protocols/EmLanProto/src/mlan.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp index 966804297e..c24d0d9e42 100644 --- a/protocols/EmLanProto/src/mlan.cpp +++ b/protocols/EmLanProto/src/mlan.cpp @@ -1105,8 +1105,8 @@ void CMLan::OnInTCPConnection(u_long addr, SOCKET in_sock) fts.totalBytes = rcTotalSize; fts.totalFiles = rcTotalFiles; fts.totalProgress = 0; - fts.wszWorkingDir = conn->m_szDir; - fts.pwszFiles = conn->m_szFiles; + fts.szWorkingDir.w = conn->m_szDir; + fts.pszFiles.w = conn->m_szFiles; bool err = false; @@ -1118,7 +1118,7 @@ void CMLan::OnInTCPConnection(u_long addr, SOCKET in_sock) } EMLOG("Ok"); - fts.szCurrentFile = fts.pszFiles[fileNo]; + fts.szCurrentFile.a = fts.pszFiles.a[fileNo]; fts.currentFileNumber = fileNo; fts.currentFileProgress = 0; fts.currentFileSize = *((int*)(conn->m_buf + 1)); @@ -1310,8 +1310,8 @@ void CMLan::OnOutTCPConnection(u_long, SOCKET out_socket, LPVOID lpParameter) fts.totalBytes = size; fts.totalFiles = filecount; fts.totalProgress = 0; - fts.wszWorkingDir = conn->m_szDir; - fts.pwszFiles = conn->m_szFiles; + fts.szWorkingDir.w = conn->m_szDir; + fts.pszFiles.w = conn->m_szFiles; EMLOG("Sending file size"); if (conn->Send(buf, len)) { @@ -1371,7 +1371,7 @@ void CMLan::OnOutTCPConnection(u_long, SOCKET out_socket, LPVOID lpParameter) int filepos = *((int*)(conn->m_buf + 1)); SetFilePointer(hFile, filepos, nullptr, FILE_BEGIN); - fts.szCurrentFile = fts.pszFiles[fileNo]; + fts.szCurrentFile.a = fts.pszFiles.a[fileNo]; fts.currentFileTime = get_time(); fts.currentFileNumber = fileNo; fts.currentFileProgress = filepos; |