From e3d16bc93238375ae2457175622885868b61eade Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 2 Mar 2010 11:22:31 +0100
Subject: [PATCH] Botan/Net7 libs: Fix warnings about unused parameters.
---
src/libs/3rdparty/botan/src/utils/mlock.cpp | 10 ++++++++++
src/libs/3rdparty/net7ssh/src/ne7ssh.cpp | 2 +-
src/libs/3rdparty/net7ssh/src/ne7ssh_channel.cpp | 6 +++---
src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/libs/3rdparty/botan/src/utils/mlock.cpp b/src/libs/3rdparty/botan/src/utils/mlock.cpp
index 9bb062da523..c8d91eb8509 100644
--- a/src/libs/3rdparty/botan/src/utils/mlock.cpp
+++ b/src/libs/3rdparty/botan/src/utils/mlock.cpp
@@ -19,7 +19,12 @@ namespace Botan {
/*
* Lock an area of memory into RAM
*/
+#if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
+ || defined(BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK)
bool lock_mem(void* ptr, u32bit bytes)
+#else
+bool lock_mem(void*, u32bit)
+#endif
{
#if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
return (mlock(ptr, bytes) == 0);
@@ -33,7 +38,12 @@ bool lock_mem(void* ptr, u32bit bytes)
/*
* Unlock a previously locked region of memory
*/
+#if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
+ || defined(BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK)
void unlock_mem(void* ptr, u32bit bytes)
+#else
+void unlock_mem(void*, u32bit)
+#endif
{
#if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
munlock(ptr, bytes);
diff --git a/src/libs/3rdparty/net7ssh/src/ne7ssh.cpp b/src/libs/3rdparty/net7ssh/src/ne7ssh.cpp
index 6162999e52f..08fbe52a1be 100644
--- a/src/libs/3rdparty/net7ssh/src/ne7ssh.cpp
+++ b/src/libs/3rdparty/net7ssh/src/ne7ssh.cpp
@@ -876,7 +876,7 @@ bool Ne7SftpSubsystem::readFile (uint32 fileID, uint64 offset)
return sftp->readFile (fileID, offset);
}
-bool Ne7SftpSubsystem::writeFile (uint32 fileID, const uint8* data, uint32 len, uint64 offset)
+bool Ne7SftpSubsystem::writeFile (uint32 fileID, const uint8* data, uint32 len, uint64 /* offset */)
{
if (!inited) return errorNotInited();
return sftp->writeFile (fileID, data, len);
diff --git a/src/libs/3rdparty/net7ssh/src/ne7ssh_channel.cpp b/src/libs/3rdparty/net7ssh/src/ne7ssh_channel.cpp
index 48b8f68a79b..2f31e19a6d6 100644
--- a/src/libs/3rdparty/net7ssh/src/ne7ssh_channel.cpp
+++ b/src/libs/3rdparty/net7ssh/src/ne7ssh_channel.cpp
@@ -99,7 +99,7 @@ bool ne7ssh_channel::adjustWindow (Botan::SecureVector<Botan::byte>& packet)
return true;
}
-bool ne7ssh_channel::handleEof (Botan::SecureVector<Botan::byte>& packet)
+bool ne7ssh_channel::handleEof (Botan::SecureVector<Botan::byte>& /* packet */)
{
this->cmdComplete = true;
windowRecv = 0;
@@ -111,9 +111,9 @@ bool ne7ssh_channel::handleEof (Botan::SecureVector<Botan::byte>& packet)
return false;
}
-void ne7ssh_channel::handleClose (Botan::SecureVector<Botan::byte>& newPacket)
+void ne7ssh_channel::handleClose (Botan::SecureVector<Botan::byte>& /* newPacket */)
{
- ne7ssh_string packet;
+ //ne7ssh_string packet;
if (!closed) sendClose ();
windowRecv = 0;
diff --git a/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp b/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp
index b1521bbd3a6..e43094f4b47 100644
--- a/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp
+++ b/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp
@@ -751,7 +751,7 @@ uint64 Ne7sshSftp::getFileSize (uint32 fileID)
return attrs.size;
}
-bool Ne7sshSftp::getFileAttrs (Ne7SftpSubsystem::fileAttrs& attributes, const char* remoteFile, bool followSymLinks)
+bool Ne7sshSftp::getFileAttrs (Ne7SftpSubsystem::fileAttrs& attributes, const char* remoteFile, bool /* followSymLinks */)
{
if (!remoteFile)
{
--
GitLab