fixed various silly warnings, this closes pull/84, warning must die

6 files changed, 10 insertions, 10 deletions

diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
index 2a0241176a..5f2c1da792 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
@@ -94,7 +94,7 @@ bool CDVDStateSerializer::DVDToXMLState( std::string &xmlstate, const dvd_state_
           }
 
           { TiXmlElement eValue("tv_usec");
-            sprintf(buffer, "%ld", state->registers.GPRM_time[i].tv_usec);
+            sprintf(buffer, "%ld", (long int)state->registers.GPRM_time[i].tv_usec);
             eValue.InsertEndChild( TiXmlText( buffer ) );
             eTime.InsertEndChild( eValue ) ;
           }
@@ -251,7 +251,7 @@ bool CDVDStateSerializer::XMLToDVDState( dvd_state_t *state, const std::string &
 
       text = TiXmlHandle( element ).FirstChildElement("time").FirstChildElement("tv_usec").FirstChild().Text();
       if( text )
-        sscanf(text->Value(), "%ld", &state->registers.GPRM_time[index].tv_usec);
+        sscanf(text->Value(), "%ld", (long int*)&state->registers.GPRM_time[index].tv_usec);
     }
     element = element->NextSiblingElement("gprm");
   }
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp
index 97d66b5f36..9ca8af3366 100644
--- a/xbmc/filesystem/iso9660.cpp
+++ b/xbmc/filesystem/iso9660.cpp
@@ -61,7 +61,7 @@ using namespace std;
 #ifndef HAS_DVD_DRIVE
 extern "C"
 {
-  void cdio_warn(const char* msg, ...) { CLog::Log(LOGWARNING, msg); }
+  void cdio_warn(const char* msg, ...) { CLog::Log(LOGWARNING, "%s", msg); }
 }
 #endif
 
diff --git a/xbmc/music/karaoke/karaokelyricscdg.cpp b/xbmc/music/karaoke/karaokelyricscdg.cpp
index c6b2cefb96..4b499bc301 100644
--- a/xbmc/music/karaoke/karaokelyricscdg.cpp
+++ b/xbmc/music/karaoke/karaokelyricscdg.cpp
@@ -614,10 +614,10 @@ bool CKaraokeLyricsCDG::Load()
   
   if ( buggy_commands == 0 )
 	CLog::Log( LOGDEBUG, "CDG loader: CDG file %s has been loading successfully, %d useful packets, %dKb used",
-				m_cdgFile.c_str(), m_cdgStream.size(), m_cdgStream.size() * sizeof(CDGPacket) / 1024 );
+				m_cdgFile.c_str(), (int)m_cdgStream.size(), (int)(m_cdgStream.size() * sizeof(CDGPacket) / 1024) );
  else
 	CLog::Log( LOGDEBUG, "CDG loader: CDG file %s was damaged, %d errors ignored, %d useful packets, %dKb used",
-				m_cdgFile.c_str(), buggy_commands, m_cdgStream.size(), m_cdgStream.size() * sizeof(CDGPacket) / 1024 );
+				m_cdgFile.c_str(), buggy_commands, (int)m_cdgStream.size(), (int)(m_cdgStream.size() * sizeof(CDGPacket) / 1024) );
 
   return true;
 }
diff --git a/xbmc/network/osx/ZeroconfBrowserOSX.cpp b/xbmc/network/osx/ZeroconfBrowserOSX.cpp
index 9a6926ba0e..d8f10d8ebd 100644
--- a/xbmc/network/osx/ZeroconfBrowserOSX.cpp
+++ b/xbmc/network/osx/ZeroconfBrowserOSX.cpp
@@ -150,7 +150,7 @@ void CZeroconfBrowserOSX::BrowserCallback(CFNetServiceBrowserRef browser, CFOpti
     }
   } else
   {
-    CLog::Log(LOGERROR, "CZeroconfBrowserOSX::BrowserCallback returned (domain = %d, error = %ld)\n", error->domain, error->error);
+    CLog::Log(LOGERROR, "CZeroconfBrowserOSX::BrowserCallback returned (domain = %d, error = %ld)\n", (int)error->domain, error->error);
   }
 }
 
@@ -230,7 +230,7 @@ bool CZeroconfBrowserOSX::doAddServiceType(const CStdString& fcr_service_type)
     CFNetServiceBrowserUnscheduleFromRunLoop(p_browser, m_runloop, kCFRunLoopCommonModes);         
     CFRelease(p_browser);
     p_browser = NULL;
-    CLog::Log(LOGERROR, "CFNetServiceBrowserSearchForServices returned (domain = %d, error = %ld)\n", error.domain, error.error);
+    CLog::Log(LOGERROR, "CFNetServiceBrowserSearchForServices returned (domain = %d, error = %ld)\n", (int)error.domain, error.error);
   } else
   {
     //store the browser
diff --git a/xbmc/network/osx/ZeroconfOSX.cpp b/xbmc/network/osx/ZeroconfOSX.cpp
index 19de5970dd..6e6ab326c8 100644
--- a/xbmc/network/osx/ZeroconfOSX.cpp
+++ b/xbmc/network/osx/ZeroconfOSX.cpp
@@ -79,7 +79,7 @@ bool CZeroconfOSX::doPublishService(const std::string& fcr_identifier,
     CFNetServiceSetClient(netService, NULL, NULL);
     CFRelease(netService);
     netService = NULL;
-    CLog::Log(LOGERROR, "CZeroconfOSX::doPublishService CFNetServiceRegister returned (domain = %d, error = %ld)\n", error.domain, error.error);
+    CLog::Log(LOGERROR, "CZeroconfOSX::doPublishService CFNetServiceRegister returned (domain = %d, error = %ld)\n", (int)error.domain, error.error);
   } else
   {
     CSingleLock lock(m_data_guard);
@@ -121,7 +121,7 @@ void CZeroconfOSX::registerCallback(CFNetServiceRef theService, CFStreamError* e
         CLog::Log(LOGERROR, "CZeroconfOSX::registerCallback name collision occured");
         break;
       default:
-        CLog::Log(LOGERROR, "CZeroconfOSX::registerCallback returned (domain = %d, error = %ld)\n", error->domain, error->error);
+        CLog::Log(LOGERROR, "CZeroconfOSX::registerCallback returned (domain = %d, error = %ld)\n", (int)error->domain, error->error);
         break;
     }
     p_this->cancelRegistration(theService);
diff --git a/xbmc/threads/Thread.cpp b/xbmc/threads/Thread.cpp
index 68dbc31663..ad1a01e1f9 100644
--- a/xbmc/threads/Thread.cpp
+++ b/xbmc/threads/Thread.cpp
@@ -131,7 +131,7 @@ __thread CThread* pLocalThread = NULL;
 #endif
 void CThread::term_handler (int signum)
 {
-  CLog::Log(LOGERROR,"thread 0x%lx (%lu) got signal %d. calling OnException and terminating thread abnormally.", pthread_self(), pthread_self(), signum);
+  CLog::Log(LOGERROR,"thread 0x%lx (%lu) got signal %d. calling OnException and terminating thread abnormally.", (long unsigned int)pthread_self(), (long unsigned int)pthread_self(), signum);
   if (LOCAL_THREAD)
   {
     LOCAL_THREAD->m_bStop = TRUE;