feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

utils/ssh: suppress warnings in release build

Browse Source 
Change-Id: I531a6b657b52540506662e670d1a2a6404fbc7b8
Reviewed-on: http://codereview.qt.nokia.com/3332
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-08-22 17:42:10 +02:00
committed by hjk
parent 7d219d788b
commit 2a0f162132
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/ssh/sshbotanconversions_p.h
View File

@@ -85,12 +85,14 @@ inline const char *botanSha1Name() { return "SHA-1"; }
inline const char *botanHMacAlgoName(const QByteArray &rfcAlgoName) inline const char *botanHMacAlgoName(const QByteArray &rfcAlgoName)
{ {
Q_ASSERT(rfcAlgoName == SshCapabilities::HMacSha1); Q_ASSERT(rfcAlgoName == SshCapabilities::HMacSha1);
Q_UNUSED(rfcAlgoName);
return botanSha1Name(); return botanSha1Name();
} }
inline quint32 botanHMacKeyLen(const QByteArray &rfcAlgoName) inline quint32 botanHMacKeyLen(const QByteArray &rfcAlgoName)
{ {
Q_ASSERT(rfcAlgoName == SshCapabilities::HMacSha1); Q_ASSERT(rfcAlgoName == SshCapabilities::HMacSha1);
Q_UNUSED(rfcAlgoName);
return 20; return 20;
} }

2
src/libs/utils/ssh/sshincomingpacket.cpp
View File

@@ -377,6 +377,7 @@ SshChannelExitStatus SshIncomingPacket::extractChannelExitStatus() const
exitStatus.localChannel = SshPacketParser::asUint32(m_data, &offset); exitStatus.localChannel = SshPacketParser::asUint32(m_data, &offset);
const QByteArray &type = SshPacketParser::asString(m_data, &offset); const QByteArray &type = SshPacketParser::asString(m_data, &offset);
Q_ASSERT(type == ExitStatusType); Q_ASSERT(type == ExitStatusType);
Q_UNUSED(type);
if (SshPacketParser::asBool(m_data, &offset)) if (SshPacketParser::asBool(m_data, &offset))
throw SshPacketParseException(); throw SshPacketParseException();
exitStatus.exitStatus = SshPacketParser::asUint32(m_data, &offset); exitStatus.exitStatus = SshPacketParser::asUint32(m_data, &offset);
@@ -398,6 +399,7 @@ SshChannelExitSignal SshIncomingPacket::extractChannelExitSignal() const
exitSignal.localChannel = SshPacketParser::asUint32(m_data, &offset); exitSignal.localChannel = SshPacketParser::asUint32(m_data, &offset);
const QByteArray &type = SshPacketParser::asString(m_data, &offset); const QByteArray &type = SshPacketParser::asString(m_data, &offset);
Q_ASSERT(type == ExitSignalType); Q_ASSERT(type == ExitSignalType);
Q_UNUSED(type);
if (SshPacketParser::asBool(m_data, &offset)) if (SshPacketParser::asBool(m_data, &offset))
throw SshPacketParseException(); throw SshPacketParseException();
exitSignal.signal = SshPacketParser::asString(m_data, &offset); exitSignal.signal = SshPacketParser::asString(m_data, &offset);