From 304f9c038aafbbd0bd9bf28aa68a8fb9767589fd Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 22:59:20 +0100 Subject: [PATCH 01/10] register is deprecated and does nothing but throw a warning with c++11 --- tools/depends/native/TexturePacker/src/md5.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/depends/native/TexturePacker/src/md5.cpp b/tools/depends/native/TexturePacker/src/md5.cpp index ce0c3109639b8..b9788dd384306 100644 --- 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]; From c638d693cbc114d29c81ee0d3f9cdcff3fc2509a Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:00:49 +0100 Subject: [PATCH 02/10] fix initializer list orders --- lib/addons/library.kodi.guilib/libKODI_guilib.cpp | 8 ++++---- lib/libexif/ExifParse.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/addons/library.kodi.guilib/libKODI_guilib.cpp b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp index 14662cd5cd5eb..0354facb8e61b 100644 --- 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 index 03b9263c1c368..1b15745f15bfa 100755 --- 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) {} //-------------------------------------------------------------------------- From 5ff2dd83943dd9fddd29f3e7004bb67e9efcbfec Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:01:18 +0100 Subject: [PATCH 03/10] remove extra parantheses to quell compiler warning --- xbmc-xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc-xrandr.c b/xbmc-xrandr.c index 7d164d0a31648..50f04f37c3f45 100644 --- 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; From fd399deafabd1e9c3f74bb9cf3dd6a40e6bf0e3e Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:07:02 +0100 Subject: [PATCH 04/10] fix format specifiers to quell compiler warnings --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- xbmc/events/BaseEvent.cpp | 2 +- xbmc/utils/StringUtils.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index eba55892ea301..4129d3d6a77ce 100644 --- 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 index abdad4fa7aba9..4bdda89f3e453 100644 --- 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/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp index c8bd8613682bb..d597c8787aa07 100644 --- a/xbmc/utils/StringUtils.cpp +++ b/xbmc/utils/StringUtils.cpp @@ -1316,7 +1316,7 @@ std::string StringUtils::FormatFileSize(uint64_t bytes) { const std::array 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(bytes); From 157ef7ebcc5fd2247571f8628a48d3d9d67c2aba Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:10:45 +0100 Subject: [PATCH 05/10] add default case to quell compiler warnings --- xbmc/utils/Variant.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xbmc/utils/Variant.cpp b/xbmc/utils/Variant.cpp index e21167a9cb240..a6b7e4302644b 100644 --- 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; } From 0b1dd300e70339e27e7d2cf110f955a4bcd5e980 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:11:07 +0100 Subject: [PATCH 06/10] add extra braces indicating an initializer list you just won't shut up will you clang? --- xbmc/utils/StringUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp index d597c8787aa07..d30fbf25307ac 100644 --- a/xbmc/utils/StringUtils.cpp +++ b/xbmc/utils/StringUtils.cpp @@ -1314,7 +1314,7 @@ uint64_t StringUtils::ToUint64(std::string str, uint64_t fallback) noexcept std::string StringUtils::FormatFileSize(uint64_t bytes) { - const std::array units{"B", "kB", "MB", "GB", "TB", "PB"}; + const std::array units{{"B", "kB", "MB", "GB", "TB", "PB"}}; if (bytes < 1000) return Format("%" PRIu64 "B", bytes); From f3cdbe2db10eed85a8d95bb1a49a589d7569f69e Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:13:54 +0100 Subject: [PATCH 07/10] fixed: wrong signature for IoControl method in PipeFile --- xbmc/filesystem/PipeFile.cpp | 2 +- xbmc/filesystem/PipeFile.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/filesystem/PipeFile.cpp b/xbmc/filesystem/PipeFile.cpp index fb94e106dcc15..28230fb447481 100644 --- 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 index ae307ebb7f492..27204f10e5d87 100644 --- 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; From d2008935d95fcdca39c341e5b105f77a0c3e60de Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:14:48 +0100 Subject: [PATCH 08/10] fixed: wrong signature for OpenForWrite in RarFile --- xbmc/filesystem/RarFile.cpp | 2 +- xbmc/filesystem/RarFile.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/filesystem/RarFile.cpp b/xbmc/filesystem/RarFile.cpp index 54bf8e3127584..6016bc203af4f 100644 --- 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 index 8aac5272c864a..58b657650090e 100644 --- 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: From 14a4ddd0a08292d1e25dd82b1aebd4b5c3465736 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:17:38 +0100 Subject: [PATCH 09/10] fixed: wrong signature for method in GUIWindowPrograms --- xbmc/programs/GUIWindowPrograms.cpp | 2 +- xbmc/programs/GUIWindowPrograms.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp index a50f6056f9a59..d26554544ff90 100644 --- 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 index 1398e197808d3..b9fbda83cb643 100644 --- 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; From 5d06907275cf60dc7584108e7ceabefc868d0c99 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2016 23:18:48 +0100 Subject: [PATCH 10/10] fixed: prototype struct as struct --- xbmc/network/linux/ZeroconfAvahi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/network/linux/ZeroconfAvahi.h b/xbmc/network/linux/ZeroconfAvahi.h index c66e660965c7f..671418444ecc2 100644 --- 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 > tServiceMap; //goes through a list of todos and publishs them (takes the client a param, as it might be called from