rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed windows 64-bit warnings.

This commit is contained in:
Nick Bolton 2013-04-10 15:04:14 +00:00
parent 11cdee4aa3
commit 9cd8023e92
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/synergy/CCryptoStream.cpp
View File

@ -38,10 +38,10 @@ CCryptoStream::CCryptoStream(
m_key = new byte[kKeyLength]; m_key = new byte[kKeyLength];
if (!options.m_pass.empty()) { if (!options.m_pass.empty()) {
createKey(m_key, options.m_pass, kKeyLength, options.m_pass.length()); createKey(m_key, options.m_pass, kKeyLength, static_cast<UInt8>(options.m_pass.length()));
byte iv[CRYPTO_IV_SIZE]; byte iv[CRYPTO_IV_SIZE];
createKey(iv, options.m_pass, CRYPTO_IV_SIZE, options.m_pass.length() * 2); createKey(iv, options.m_pass, CRYPTO_IV_SIZE, static_cast<UInt8>(options.m_pass.length()) * 2);
setIv(iv); setIv(iv);
} }
} }

6
src/lib/synergy/CDaemonApp.cpp
View File

@ -300,10 +300,10 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*)
LOG((CLOG_DEBUG "new command, elevate=%d command=%s", cm->elevate(), command.c_str())); LOG((CLOG_DEBUG "new command, elevate=%d command=%s", cm->elevate(), command.c_str()));
CString debugArg("--debug"); CString debugArg("--debug");
int debugArgPos = command.find(debugArg); UInt32 debugArgPos = static_cast<UInt32>(command.find(debugArg));
if (debugArgPos != CString::npos) { if (debugArgPos != CString::npos) {
int from = debugArgPos + debugArg.size() + 1; UInt32 from = debugArgPos + static_cast<UInt32>(debugArg.size()) + 1;
int nextSpace = command.find(" ", from); UInt32 nextSpace = static_cast<UInt32>(command.find(" ", from));
CString logLevel(command.substr(from, nextSpace - from)); CString logLevel(command.substr(from, nextSpace - from));
try { try {