23 compiler warning fixes

diff --git a/audioomx.cc b/audioomx.cc
index 94f5137bf74a68e6d174345ce93c406b11271ed1..b664925e68809fee80694164c98cd2e14b25ef1f 100644 (file)
--- a/audioomx.cc
+++ b/audioomx.cc
@@ -2320,16 +2320,14 @@ UINT AudioOMX::DeliverMediaPacket(MediaPacket mpacket, const UCHAR* buffer,
 
 }
 
-
-
-long long AudioOMX::SetStartOffset(long long curreftime, bool *rsync){
-  VideoOMX *vw=(VideoOMX*)Video::getInstance();
+long long AudioOMX::SetStartOffset(long long curreftime, bool *rsync)
+{
+  VideoOMX* vw = dynamic_cast<VideoOMX*>(Video::getInstance());
   return vw->SetStartAudioOffset(curreftime,rsync);
 }
 
-void AudioOMX::ResetTimeOffsets() {
-  VideoOMX *vw=(VideoOMX*)Video::getInstance();
+void AudioOMX::ResetTimeOffsets()
+{
+  VideoOMX* vw = dynamic_cast<VideoOMX*>(Video::getInstance());
   vw->ResetTimeOffsets();
 }
-
-

diff --git a/command.cc b/command.cc
index 7f4ab5a4882de4d15844db3441bd7c39ac305ce0..96336f673d5644b24e7997fce36696d9b10cf8c8 100644 (file)
--- a/command.cc
+++ b/command.cc
@@ -1038,14 +1038,14 @@ void Command::doJustConnected(VConnect* vconnect)
     // Enter pre-keys here
 //    handleCommand(Input::OK);
 //    handleCommand(Input::THREE);
-//    handleCommand(Input::SIX);
+    handleCommand(Input::SIX);
 //    handleCommand(Input::OK);
 //    handleCommand(Input::UP);
 //    handleCommand(Input::PLAY);
 //    handleCommand(Input::DOWN);
 //    handleCommand(Input::DOWN);
 //    handleCommand(Input::DOWN);
- //   handleCommand(Input::OK);
+    handleCommand(Input::RIGHT);
 //    handleCommand(Input::RED);
   }
 }

diff --git a/inputcec.cc b/inputcec.cc
index 1705c4d2566f4d9001ccb8a59e77b176f5c402ed..97cec37171681dff8fe47f995fafcb9d00de0d12 100644 (file)
--- a/inputcec.cc
+++ b/inputcec.cc
@@ -446,7 +446,7 @@ void InputCEC::InitKeymap()
   NAMETRICK2(CEC_USER_CONTROL_CODE_,MAX );
 }
 
-const char* InputCEC::getHardCodedHardwareKeyNamesForVompKey(UCHAR vompKey)
+const char* InputCEC::getHardCodedHardwareKeyNamesForVompKey(UCHAR /* vompKey */)
 {
   return ""; // FIXME
 }

diff --git a/log.cc b/log.cc
index 4da7d33af61ac9fb2beedd33e6c7e58398330a9d..cd8e286b31ec11050d11317d6f1a57185b7faf1b 100644 (file)
--- a/log.cc
+++ b/log.cc
@@ -73,8 +73,10 @@ void Log::downLogLevel()
   log("Log", logLevel, "Log level is now %i", logLevel);
 }
 
-int Log::init(int startLogLevel,const char* fileName, int tenabled)
+int Log::init(int startLogLevel, const char* fileName, int tenabled)
 {
+  (void)fileName;
+
   initted = 1;
   logLevel = startLogLevel;
   enabled = tenabled;
@@ -110,7 +112,7 @@ int Log::log(const char *fromModule, int level,const char* message, ...)
   struct tm tms;
   LOCALTIME_R(&tv.tv_sec, &tms);
   spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", &tms);
-  spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%06lu ", (unsigned long)tv.tv_usec);
+  spaceLeft -= SNPRINTF(&buffer[150-spaceLeft], spaceLeft, "%06lu ", static_cast<unsigned long>(tv.tv_usec));
 #else
   struct _timeb tb;
   _ftime(&tb);

diff --git a/main.cc b/main.cc
index efe6bc82905ae82d63f7d017d81f91e0094c0051..924d9a7d3dde179b90091643ebba4344691fa9b0 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -67,6 +67,8 @@
 void threadSignalReceiverFunction();
 #endif
 
+ULLONG htonll(ULLONG);
+ULLONG ntohll(ULLONG);
 void shutdown(int code);
 
 // Global variables --------------------------------------------------------------------------------------------------
@@ -107,6 +109,7 @@ int main(int argc, char** argv)
         break;
       case 'd':
         debugEnabled = true; // and...
+        [[fallthrough]];
       case 'n':
         daemonize = false;
         break;

diff --git a/media.h b/media.h
index 4681bbe165550a77b2976dfe1cf3f38d7a2fc6bc..980390457918c42512a03ca6001b5199c3185666 100644 (file)
--- a/media.h
+++ b/media.h
@@ -114,10 +114,10 @@ class MediaInfo : public Serializable{
     /**
       * return any info item contained within this info
       */
-    virtual const char * getInfo(ULONG infoId) { return NULL;}
-    virtual ULLONG getIntegerInfo(ULONG infoId) { return 0;}
-    virtual const char * getInfoName(ULONG infoId) { return NULL;}
-    virtual bool hasInfo(ULONG infoId) { return false;}
+    virtual const char * getInfo(ULONG /* infoId */) { return NULL;}
+    virtual ULLONG getIntegerInfo(ULONG /* infoId */) { return 0;}
+    virtual const char * getInfoName(ULONG /* infoId */) { return NULL;}
+    virtual bool hasInfo(ULONG /* infoId */) { return false;}
     MediaInfo() {
       size=0;
       canPosition=true;

diff --git a/mutex.cc b/mutex.cc
index 674862662b900ceffa3ac8b9bc8bf56eebe9ee02..42478c6356119311e299cf681d22c45b25d10545 100644 (file)
--- a/mutex.cc
+++ b/mutex.cc
@@ -19,6 +19,10 @@
 */
 #include "mutex.h"
 
+// FIXME - delete me.
+
+
+
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/syscall.h>

diff --git a/signal.cc b/signal.cc
index 3479cc9b26230b3611343c878875eb9f4e4cddbc..bc4eb7260ddda1855838e65e733ec54d1e4efc4c 100644 (file)
--- a/signal.cc
+++ b/signal.cc
@@ -19,6 +19,9 @@
 */
 #include "signal.h"
 
+// FIXME
+// well, I say fix... Delete me.
+
 
 Signal::Signal()
 {

diff --git a/vdr.cc b/vdr.cc
index 6e1b6ac92cf26d9028d1a8d86125d796e62dd124..b7a28c3b178c62430d912e634718276d615c3cc9 100644 (file)
--- a/vdr.cc
+++ b/vdr.cc
@@ -176,7 +176,7 @@ void VDR::findServers(std::vector<VDRServer>& servers)
   DatagramSocket ds(0);
   int haveAtLeastOne = 0;
   int retval;
-  int waitType = 1;
+  UCHAR waitType = 1;
   bool firstloop = true;
   while(findingServer)
   {
@@ -185,11 +185,11 @@ void VDR::findServers(std::vector<VDRServer>& servers)
       ds.shutdown();
       ds.init();
       logger->log("VDR", Log::NOTICE, "Broadcasting for server");
-      ds.send("255.255.255.255", 51051, message, 15);
-      ds.send("255.255.255.255", 51052, message, 15);
-      ds.send("255.255.255.255", 51053, message, 15);
-      ds.send("255.255.255.255", 51054, message, 15);
-      ds.send("255.255.255.255", 51055, message, 15);
+      ds.send("255.255.255.255", 51051U, message, 15);
+      ds.send("255.255.255.255", 51052U, message, 15);
+      ds.send("255.255.255.255", 51053U, message, 15);
+      ds.send("255.255.255.255", 51054U, message, 15);
+      ds.send("255.255.255.255", 51055U, message, 15);
       if(!firstloop) wol->doWakeUp();
     }
     retval = ds.waitforMessage(waitType);

diff --git a/videoomx.cc b/videoomx.cc
index 8f90ffec036abfb81ed6100c9cfc35425827ed65..eed1f7cff48da9eaa3ab429f93b14384cd8418dc 100644 (file)
--- a/videoomx.cc
+++ b/videoomx.cc
@@ -3208,7 +3208,7 @@ int VideoOMX::EnterIframePlayback()
        }
        Log::getInstance()->log("Video", Log::DEBUG,
                                                        "EnterIframePlayback 2");
-       ((AudioOMX*)Audio::getInstance())->DeAllocateCodecsOMX();
+       dynamic_cast<AudioOMX*>(Audio::getInstance())->DeAllocateCodecsOMX();
        DeAllocateCodecsOMX();
        AllocateCodecsOMX();
        Log::getInstance()->log("Video", Log::DEBUG,

diff --git a/wol.cc b/wol.cc
index c5b7f0babb0acc8c09e599529b7570f9ebd92e2e..f54e9e885391fb0d9c8f3feca5c7c0cb23abb0e3 100644 (file)
--- a/wol.cc
+++ b/wol.cc
@@ -202,7 +202,7 @@ int Wol::convertToBinary(char *bufp, unsigned char *addr)
         }
         if (c != 0)
             bufp++;
-        *ptr++ = (unsigned char) (val & 0377);
+        *ptr++ = static_cast<unsigned char>(val & 0377);
         i++;
 
         /* We might get a semicolon here - not required. */
@@ -245,7 +245,7 @@ int Wol::doWakeUp()
 
   /* Set socket options */
 #ifndef WIN32
-  if (setsockopt (packet, SOL_SOCKET, SO_BROADCAST, (caddr_t) &optval,
+  if (setsockopt (packet, SOL_SOCKET, SO_BROADCAST, static_cast<void*>(&optval),
      sizeof (optval)) < 0)
 #else
   if (setsockopt (packet, SOL_SOCKET, SO_BROADCAST, (char*)&optval,
@@ -273,7 +273,7 @@ int Wol::doWakeUp()
       *ptr++ = ethaddr [i];
 
   /* Send the packet out */
-  if (sendto (packet,(char*) buf, 102, 0, reinterpret_cast<struct sockaddr *>(&sap), sizeof (sap)) < 0)
+  if (sendto (packet, static_cast<void*>(buf), 102, 0, reinterpret_cast<struct sockaddr *>(&sap), sizeof (sap)) < 0)
   {
     fprintf (stderr, " sendto failed, %s\n",
     strerror(errno));

diff --git a/wremoteconfig.cc b/wremoteconfig.cc
index 1340a243b1e60a3907d12e55c8cf1fe5730ebbb6..9eb5fb5da46964df7e2f0da10e36c6e3d98c1660 100644 (file)
--- a/wremoteconfig.cc
+++ b/wremoteconfig.cc
@@ -66,21 +66,16 @@ void WRemoteConfig::initSelectList(bool startup)
   
   for (UINT i = 0; i < 256; i++)
   {
-    Log::getInstance()->log("WRemoteConfig", Log::DEBUG, "%u", i);
     const char* vompKeyName = InputMan::getVompKeyName(static_cast<UCHAR>(i));
     if (vompKeyName != NULL)
     {
       std::string line;
       line.reserve(150);
       line += vompKeyName;
-      line += ":\t";
-    Log::getInstance()->log("WRemoteConfig", Log::DEBUG, "A");
+      line += ": \t";
       line += inputMan->getHardCodedHardwareKeyNamesForVompKey(static_cast<UCHAR>(i));
-      line += '\t';
-    Log::getInstance()->log("WRemoteConfig", Log::DEBUG, "B");
+      line += " \t"; // FIXME extra spaces for braindead strtok. Ditch strtok.
       line += inputMan->getAllHardwareKeyNamesAssignedToVompKey(static_cast<UCHAR>(i));
-    Log::getInstance()->log("WRemoteConfig", Log::DEBUG, "C");
-
       sl.addOption(line.c_str(), i, 0);
     }
   }

diff --git a/wtabbar.cc b/wtabbar.cc
index d9853f90e2497ba5eb8bdcf1d60d95968b6be96e..c28fabb855b68cfc261df09599285cc59b372546 100644 (file)
--- a/wtabbar.cc
+++ b/wtabbar.cc
@@ -58,7 +58,7 @@ void WTabBar::addTab(const char* name, Boxx* boxx)
   
   for(UINT i = 0; i < strlen(name); i++)
   {
-    td.nameWidth += (UINT)charWidth(name[i]);
+    td.nameWidth += static_cast<UINT>(charWidth(name[i]));
   }
 
   UINT newButtonX = 22;