Silence warnings

smoofra · Oct 14, 2014 · deb4166 · deb4166
1 parent 2b2c0d5
commit deb4166
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/rct/AES256CBC.cpp b/rct/AES256CBC.cpp
@@ -38,7 +38,7 @@ AES256CBCPrivate::~AES256CBCPrivate()
 
 static void deriveKey(const String& key, unsigned char* outkey,
                       unsigned char* outiv, int rounds,
-                      const unsigned char* salt = 0)
+                      const unsigned char* salt)
 {
     String preHash = key, currentHash, hash;
     if (salt) // we're assuming that salt is at least 8 bytes
@@ -65,7 +65,7 @@ AES256CBC::AES256CBC(const String& key, const unsigned char* salt)
 {
     unsigned char outkey[32];
 
-    deriveKey(key, outkey, priv->iv, 100);
+    deriveKey(key, outkey, priv->iv, 100, salt);
 #ifdef OS_Darwin
     CCCryptorCreate(kCCEncrypt, kCCAlgorithmAES128, kCCOptionPKCS7Padding,
                     outkey, kCCKeySizeAES256, priv->iv, &priv->ectx);

diff --git a/rct/Connection.cpp b/rct/Connection.cpp
@@ -136,7 +136,7 @@ void Connection::onDataAvailable(const SocketClient::SharedPtr&, Buffer&& buf)
 {
     while (true) {
         if (!mSocketClient->buffer().isEmpty())
-            mBuffers.push_back(std::move(mSocketClient->takeBuffer()));
+            mBuffers.push_back(std::move(buf));
 
         unsigned int available = bufferSize(mBuffers);
         if (!available)

diff --git a/rct/EventLoop.cpp b/rct/EventLoop.cpp
@@ -99,7 +99,7 @@ static EventLoop::WeakPtr& localEventLoop()
     return *ptr;
 }
 
-static void signalHandler(int sig)
+static void signalHandler(int /*sig*/)
 {
     char b = 'q';
     int w;

diff --git a/rct/FileSystemWatcher_inotify.cpp b/rct/FileSystemWatcher_inotify.cpp
@@ -83,6 +83,7 @@ bool FileSystemWatcher::unwatch(const Path &path)
     }
 }
 
+#if 0
 static inline void dump(unsigned mask)
 {
     if (mask & IN_ACCESS)
@@ -112,6 +113,7 @@ static inline void dump(unsigned mask)
     if (mask & IN_MOVE_SELF)
         printf("IN_MOVE_SELF ");
 }
+#endif
 
 void FileSystemWatcher::notifyReadyRead()
 {