From 6554688cb72250e759393f568b7705a635b55997 Mon Sep 17 00:00:00 2001
From: Dmytro Bogovych <dmytro.bogovych@gmail.com>
Date: Thu, 29 Oct 2020 10:09:58 +0200
Subject: [PATCH] - cleanup

---
 src/engine/agent/Agent_AudioManager.h            |  2 +-
 src/engine/audio/Audio_Helper.cpp                |  4 ++++
 src/engine/helper/HL_String.cpp                  |  4 ++--
 src/engine/helper/HL_Sync.cpp                    |  7 +++++++
 src/engine/helper/HL_Uuid.cpp                    |  2 ++
 src/engine/media/MT_Box.h                        |  2 +-
 src/libs/ice/ICELog.cpp                          | 12 ++++++------
 src/libs/resiprocate/contrib/ares/ares_process.c |  2 +-
 8 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/engine/agent/Agent_AudioManager.h b/src/engine/agent/Agent_AudioManager.h
index 86e079fa..44875f3c 100644
--- a/src/engine/agent/Agent_AudioManager.h
+++ b/src/engine/agent/Agent_AudioManager.h
@@ -38,7 +38,7 @@ class AudioManager: public Audio::Player::EndOfAudioDelegate
 {
 public:
   AudioManager();
-  ~AudioManager();
+  virtual ~AudioManager();
   
   static AudioManager& instance();
   
diff --git a/src/engine/audio/Audio_Helper.cpp b/src/engine/audio/Audio_Helper.cpp
index 3af87c44..7d2c56a2 100644
--- a/src/engine/audio/Audio_Helper.cpp
+++ b/src/engine/audio/Audio_Helper.cpp
@@ -98,6 +98,10 @@ unsigned TimeSource::time()
 #if defined(TARGET_LINUX)
   assert(0);
 #endif
+
+#if defined(TARGET_ANDROID)
+  assert(0);
+#endif
 }
 
 // --- StubTimer ---
diff --git a/src/engine/helper/HL_String.cpp b/src/engine/helper/HL_String.cpp
index f1798e97..6f43f663 100644
--- a/src/engine/helper/HL_String.cpp
+++ b/src/engine/helper/HL_String.cpp
@@ -237,8 +237,8 @@ std::pair<std::string, std::string> StringHelper::parseAssignment(const std::str
         result.second = StringHelper::trim(s.substr(p+1));
         if (trimQuotes && result.second.size() >= 2)
         {
-            if (result.second[0] == '"' && result.second[result.second.size()-1] == '"' ||
-                    result.second[0] == '\'' && result.second[result.second.size()-1] == '\'')
+            if ((result.second[0] == '"' && result.second[result.second.size()-1] == '"') ||
+                    (result.second[0] == '\'' && result.second[result.second.size()-1] == '\''))
                 result.second = result.second.substr(1, result.second.size() - 2);
         }
     }
diff --git a/src/engine/helper/HL_Sync.cpp b/src/engine/helper/HL_Sync.cpp
index 9d59736c..83768277 100644
--- a/src/engine/helper/HL_Sync.cpp
+++ b/src/engine/helper/HL_Sync.cpp
@@ -41,6 +41,8 @@ long SyncHelper::increment(long *value)
     return OSAtomicIncrement32((int32_t*)value);
 #elif TARGET_LINUX
     return -1;
+#else
+    return -1;
 #endif
 }
 
@@ -66,6 +68,11 @@ uint64_t ThreadHelper::getCurrentId()
     // RPi builds want this!
     return (uint64_t)(pthread_self());
 #endif
+
+#if defined(TARGET_ANDROID)
+    return (uint64_t)(pthread_self());
+#endif
+    return 0;
 }
 // ------------------- TimeHelper ---------------
 using namespace std::chrono;
diff --git a/src/engine/helper/HL_Uuid.cpp b/src/engine/helper/HL_Uuid.cpp
index 1f2885c3..0d423fed 100644
--- a/src/engine/helper/HL_Uuid.cpp
+++ b/src/engine/helper/HL_Uuid.cpp
@@ -71,4 +71,6 @@ bool Uuid::operator < (const Uuid& right) const
 #if defined(TARGET_WIN)
     return memcmp(&mUuid, &right.mUuid, sizeof(mUuid)) < 0;
 #endif
+
+    return false;
 }
diff --git a/src/engine/media/MT_Box.h b/src/engine/media/MT_Box.h
index 70e4e2c1..72f5afa1 100644
--- a/src/engine/media/MT_Box.h
+++ b/src/engine/media/MT_Box.h
@@ -21,7 +21,7 @@ namespace MT
   {
   public:
     Terminal(const CodecList::Settings& codecSettings);
-    ~Terminal();
+    virtual ~Terminal();
     
     CodecList& codeclist();  
 
diff --git a/src/libs/ice/ICELog.cpp b/src/libs/ice/ICELog.cpp
index 3e9a3c31..34dc5114 100644
--- a/src/libs/ice/ICELog.cpp
+++ b/src/libs/ice/ICELog.cpp
@@ -213,22 +213,22 @@ Logger::endLine()
            << mStream->str().c_str();
 
     std::string t = result.str();
-    if (mUseDebugWindow)
+    if (mUseDebugWindow) {
 #ifdef TARGET_WIN
         OutputDebugStringA(t.c_str());
 #elif defined(TARGET_ANDROID)
-        if (t.size() > 512)
-        {
-            std::string cut = t; cut.erase(480); // Erase tail of string
+        if (t.size() > 512) {
+            std::string cut = t;
+            cut.erase(480); // Erase tail of string
             cut += "\r\n... [cut]";
             __android_log_print(ANDROID_LOG_INFO, "VoipAgent", "%s", cut.c_str());
-        }
-        else {
+        } else {
             __android_log_print(ANDROID_LOG_INFO, "VoipAgent", "%s", t.c_str());
         }
 #else
         std::cerr << result.str() << std::endl << std::flush;
 #endif
+    }
     if (mFile)
     {
         fprintf(mFile, "%s", result.str().c_str());
diff --git a/src/libs/resiprocate/contrib/ares/ares_process.c b/src/libs/resiprocate/contrib/ares/ares_process.c
index 0c7e1104..a923c406 100644
--- a/src/libs/resiprocate/contrib/ares/ares_process.c
+++ b/src/libs/resiprocate/contrib/ares/ares_process.c
@@ -354,7 +354,7 @@ static void read_udp_packets(ares_channel channel, int server_idx,
           continue;
       /* Make sure the server has a socket and is selected in read_fds. */
       server = &channel->servers[i];
-      if ( (server->udp_socket == -1) )
+      if (server->udp_socket == -1)
           continue;
       if ( read_fds && !FD_ISSET(server->udp_socket, read_fds) )
 	  continue;