1 From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
2 From: Rudi Heitbaum <rudi@heitbaum.com>
3 Date: Wed, 6 Jul 2022 22:48:35 +1000
4 Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
5 is disallowed
6
7 ---
8 xbmc/utils/GLUtils.cpp | 10 +++++-----
9 1 file changed, 5 insertions(+), 5 deletions(-)
10
11 diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
12 index 1ef804709ff56..c36dcf6a20fec 100644
13 --- a/xbmc/utils/GLUtils.cpp
14 +++ b/xbmc/utils/GLUtils.cpp
15 @@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
16 void LogGraphicsInfo()
17 {
18 #if defined(HAS_GL) || defined(HAS_GLES)
19 - const GLubyte *s;
20 + const char* s;
21
22 - s = glGetString(GL_VENDOR);
23 + s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
24 if (s)
25 CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
26 else
27 CLog::Log(LOGINFO, "GL_VENDOR = NULL");
28
29 - s = glGetString(GL_RENDERER);
30 + s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
31 if (s)
32 CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
33 else
34 CLog::Log(LOGINFO, "GL_RENDERER = NULL");
35
36 - s = glGetString(GL_VERSION);
37 + s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
38 if (s)
39 CLog::Log(LOGINFO, "GL_VERSION = %s", s);
40 else
41 CLog::Log(LOGINFO, "GL_VERSION = NULL");
42
43 - s = glGetString(GL_SHADING_LANGUAGE_VERSION);
44 + s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
45 if (s)
46 CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
47 else
48
49 From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
50 From: Rudi Heitbaum <rudi@heitbaum.com>
51 Date: Mon, 11 Jul 2022 09:39:02 +0000
52 Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
53 pointers is disallowed
54
55 ---
56 xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
57 1 file changed, 4 insertions(+), 1 deletion(-)
58
59 diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
60 index 8a18288fd8af0..033c0f77bf454 100644
61 --- a/xbmc/windowing/X11/WinSystemX11.cpp
62 +++ b/xbmc/windowing/X11/WinSystemX11.cpp
63 @@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
64
65 if(status == Success && items_read)
66 {
67 - CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
68 + const char* s;
69 +
70 + s = reinterpret_cast<const char*>(data);
71 + CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
72 }
73 else
74 CLog::Log(LOGDEBUG,"Window Manager Name: ");
|
