Merge pull request #11010 from notspiff/quell_them_warnings

Quell some warnings
xbmc · Nov 30, 2016 · 9dd0a07 · 9dd0a07
2 parents 19a13a8 + 5d06907
commit 9dd0a07
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 20 deletions.
diff --git a/lib/addons/library.kodi.guilib/libKODI_guilib.cpp b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp
@@ -957,14 +957,14 @@ DLLEXPORT bool GUI_control_rendering_dirty(GUIHANDLE handle)
 }
 
 CAddonGUIRenderingControl::CAddonGUIRenderingControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId)
-  : m_Window(window)
-  , m_Handle(hdl)
-  , m_cb(cb)
-  , m_cbhdl(nullptr)
+  : m_cbhdl(nullptr)
   , CBCreate(nullptr)
   , CBRender(nullptr)
   , CBStop(nullptr)
   , CBDirty(nullptr)
+  , m_Window(window)
+  , m_Handle(hdl)
+  , m_cb(cb)
 {
   m_RenderingHandle = ((CB_GUILib*)m_cb)->Window_GetControl_RenderAddon(((AddonCB*)m_Handle)->addonData, m_Window->m_WindowHandle, controlId);
 }

diff --git a/lib/libexif/ExifParse.cpp b/lib/libexif/ExifParse.cpp
@@ -198,9 +198,9 @@ static void ErrNonfatal(const char* const msg, int a1, int a2)
 //--------------------------------------------------------------------------
 // Constructor.
 //--------------------------------------------------------------------------
-CExifParse::CExifParse () : m_FocalPlaneXRes(0.0),
-        m_FocalPlaneUnits(0.0), m_ExifImageWidth(0), m_MotorolaOrder(false),
-        m_DateFound(false), m_LargestExifOffset(0), m_ExifInfo(nullptr)
+CExifParse::CExifParse () : m_ExifInfo(nullptr),
+        m_FocalPlaneUnits(0.0), m_LargestExifOffset(0),
+        m_ExifImageWidth(0), m_MotorolaOrder(false), m_DateFound(false)
 {}
 
 //--------------------------------------------------------------------------

diff --git a/tools/depends/native/TexturePacker/src/md5.cpp b/tools/depends/native/TexturePacker/src/md5.cpp
@@ -59,7 +59,7 @@ byteSwap(uint32_t *buf, unsigned words)
 static void
 MD5Transform(uint32_t buf[4], uint32_t const in[16])
 {
-	register uint32_t a, b, c, d;
+	uint32_t a, b, c, d;
 
 	a = buf[0];
 	b = buf[1];

diff --git a/xbmc-xrandr.c b/xbmc-xrandr.c
@@ -2859,7 +2859,7 @@ main (int argc, char **argv)
 		    nelements = 1;
 		    format = 32;
 		}
-		else if ((type == XA_ATOM))
+		else if (type == XA_ATOM)
 		{
 		    ulong_value = XInternAtom (dpy, prop->value, False);
 		    data = (unsigned char *) &ulong_value;

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -120,7 +120,7 @@ void CDVDVideoCodecFFmpeg::CDropControl::Process(int64_t pts, bool drop)
       m_diffPTS = m_diffPTS / m_count;
       if (m_diffPTS > 0)
       {
-        CLog::Log(LOGNOTICE, "CDVDVideoCodecFFmpeg::CDropControl: calculated diff time: %lld", m_diffPTS);
+        CLog::Log(LOGNOTICE, "CDVDVideoCodecFFmpeg::CDropControl: calculated diff time: %" PRId64, m_diffPTS);
         m_state = CDropControl::VALID;
         m_count = 0;
       }

diff --git a/xbmc/events/BaseEvent.cpp b/xbmc/events/BaseEvent.cpp
@@ -113,5 +113,5 @@ std::string CBaseEvent::VariantToLocalizedString(const CVariant& variant)
 void CBaseEvent::ToSortable(SortItem& sortable, Field field) const
 {
   if (field == FieldDate)
-    sortable[FieldDate] = StringUtils::Format("%020llu", m_timestamp);
+    sortable[FieldDate] = StringUtils::Format("%020" PRIu64, m_timestamp);
 }
diff --git a/xbmc/filesystem/PipeFile.cpp b/xbmc/filesystem/PipeFile.cpp
@@ -163,7 +163,7 @@ bool CPipeFile::Rename(const CURL& url, const CURL& urlnew)
   return false;
 }
 
-int CPipeFile::IoControl(int request, void* param)
+int CPipeFile::IoControl(EIoControl, void* param)
 {
   return -1;
 }

diff --git a/xbmc/filesystem/PipeFile.h b/xbmc/filesystem/PipeFile.h
@@ -61,7 +61,7 @@ class CPipeFile : public IFile, public IPipeListener
 
   virtual bool Delete(const CURL& url);
   virtual bool Rename(const CURL& url, const CURL& urlnew);
-  virtual int IoControl(int request, void* param);
+  virtual int IoControl(EIoControl request, void* param);
 
   std::string GetName() const;
 

diff --git a/xbmc/filesystem/RarFile.cpp b/xbmc/filesystem/RarFile.cpp
@@ -275,7 +275,7 @@ int CRarFile::Stat(const CURL& url, struct __stat64* buffer)
   return -1;
 }
 
-bool CRarFile::OpenForWrite(const CURL& url)
+bool CRarFile::OpenForWrite(const CURL&, bool)
 {
   return false;
 }

diff --git a/xbmc/filesystem/RarFile.h b/xbmc/filesystem/RarFile.h
@@ -77,7 +77,7 @@ namespace XFILE
     virtual void          Close();
     virtual void          Flush();
 
-    virtual bool          OpenForWrite(const CURL& url);
+    virtual bool          OpenForWrite(const CURL& url, bool);
     unsigned int          Write(void *lpBuf, int64_t uiBufSize);
 
   protected:

diff --git a/xbmc/network/linux/ZeroconfAvahi.h b/xbmc/network/linux/ZeroconfAvahi.h
@@ -73,7 +73,7 @@ class CZeroconfAvahi : public CZeroconf
 
   //helper struct for holding information about creating a service / AvahiEntryGroup
   //we have to hold that as it's needed to recreate the service
-  class ServiceInfo;
+  struct ServiceInfo;
   typedef std::map<std::string, std::shared_ptr<ServiceInfo> > tServiceMap;
 
   //goes through a list of todos and publishs them (takes the client a param, as it might be called from

diff --git a/xbmc/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp
@@ -139,7 +139,7 @@ bool CGUIWindowPrograms::Update(const std::string &strDirectory, bool updateFilt
   return true;
 }
 
-bool CGUIWindowPrograms::OnPlayMedia(int iItem)
+bool CGUIWindowPrograms::OnPlayMedia(int iItem, const std::string&)
 {
   if ( iItem < 0 || iItem >= (int)m_vecItems->Size() ) return false;
   CFileItemPtr pItem = m_vecItems->Get(iItem);

diff --git a/xbmc/programs/GUIWindowPrograms.h b/xbmc/programs/GUIWindowPrograms.h
@@ -35,7 +35,7 @@ class CGUIWindowPrograms :
 protected:
   virtual void OnItemLoaded(CFileItem* pItem) override {};
   virtual bool Update(const std::string& strDirectory, bool updateFilterPath = true) override;
-  virtual bool OnPlayMedia(int iItem);
+  bool OnPlayMedia(int iItem, const std::string& = "") override;
   virtual void GetContextButtons(int itemNumber, CContextButtons &buttons) override;
   virtual bool OnContextButton(int itemNumber, CONTEXT_BUTTON button) override;
   bool OnAddMediaSource() override;

diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp
@@ -1314,9 +1314,9 @@ uint64_t StringUtils::ToUint64(std::string str, uint64_t fallback) noexcept
 
 std::string StringUtils::FormatFileSize(uint64_t bytes)
 {
-  const std::array<std::string, 6> units{"B", "kB", "MB", "GB", "TB", "PB"};
+  const std::array<std::string, 6> units{{"B", "kB", "MB", "GB", "TB", "PB"}};
   if (bytes < 1000)
-    return Format("%lluB", bytes);
+    return Format("%" PRIu64 "B", bytes);
 
   int i = 0;
   double value = static_cast<double>(bytes);

diff --git a/xbmc/utils/Variant.cpp b/xbmc/utils/Variant.cpp
@@ -328,6 +328,8 @@ void CVariant::cleanup()
     delete m_data.map;
     m_data.map = nullptr;
     break;
+  default:
+    break;
   }
   m_type = VariantTypeNull;
 }