From 2777162388c9306ebd798e5993694cee75f91fa5 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 21 Jan 2025 21:12:34 +0100 Subject: [PATCH 1/5] Fix strlen usage --- src/backends/sdl2_renderer.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/backends/sdl2_renderer.cpp b/src/backends/sdl2_renderer.cpp index 0a9b8c9..422ede6 100644 --- a/src/backends/sdl2_renderer.cpp +++ b/src/backends/sdl2_renderer.cpp @@ -27,6 +27,7 @@ SOFTWARE. #include #include +#include namespace tinyui { namespace { @@ -62,8 +63,8 @@ void showDriverInUse(const Context &ctx) { printDriverInfo(info); } -int queryDriver(const Context &ctx, const char *driverType, size_t maxLen) { - if (driverType == nullptr) { +int queryDriver(const Context &ctx, const std::string &driverType) { + if (driverType.empty()) { ctx.mLogger(LogSeverity::Error, "Driver type is a nullptr."); return -1; } @@ -73,11 +74,7 @@ int queryDriver(const Context &ctx, const char *driverType, size_t maxLen) { for (int i = 0; i < numRenderDrivers; ++i) { SDL_RendererInfo info; SDL_GetRenderDriverInfo(i, &info); - size_t len = strlen(driverType); - if (len > maxLen) { - len = maxLen; - } - if (strncmp(driverType, info.name, len) == 0) { + if (strncmp(driverType.c_str(), info.name, driverType.size()) == 0) { found = i; break; } @@ -267,7 +264,7 @@ ret_code Renderer::initScreen(Context &ctx, int32_t x, int32_t y, int32_t w, int return ErrorCode; } - const int driverIndex = queryDriver(ctx, "opengl", 256); + const int driverIndex = queryDriver(ctx, std__string("opengl")); if (driverIndex == -1) { ctx.mLogger(LogSeverity::Error, "Cannot open opengl driver"); return ErrorCode; From 433ada6f041da1db028d5e91dd94a8b655aa7f2d Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 21 Jan 2025 21:14:54 +0100 Subject: [PATCH 2/5] Update sdl2_renderer.cpp --- src/backends/sdl2_renderer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backends/sdl2_renderer.cpp b/src/backends/sdl2_renderer.cpp index 422ede6..8d5e449 100644 --- a/src/backends/sdl2_renderer.cpp +++ b/src/backends/sdl2_renderer.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include #include -#include +#include namespace tinyui { namespace { @@ -63,7 +63,7 @@ void showDriverInUse(const Context &ctx) { printDriverInfo(info); } -int queryDriver(const Context &ctx, const std::string &driverType) { +int queryDriver(const Context &ctx, const std::string_view &driverType) { if (driverType.empty()) { ctx.mLogger(LogSeverity::Error, "Driver type is a nullptr."); return -1; From 5f64a6386c2597e53586f63f716fdfd09a891988 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 21 Jan 2025 21:17:46 +0100 Subject: [PATCH 3/5] Update sdl2_renderer.cpp --- src/backends/sdl2_renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/sdl2_renderer.cpp b/src/backends/sdl2_renderer.cpp index 8d5e449..cb0dba7 100644 --- a/src/backends/sdl2_renderer.cpp +++ b/src/backends/sdl2_renderer.cpp @@ -74,7 +74,7 @@ int queryDriver(const Context &ctx, const std::string_view &driverType) { for (int i = 0; i < numRenderDrivers; ++i) { SDL_RendererInfo info; SDL_GetRenderDriverInfo(i, &info); - if (strncmp(driverType.c_str(), info.name, driverType.size()) == 0) { + if (strncmp(driverType.data(), info.name, driverType.size()) == 0) { found = i; break; } From a74da661abb3eedb11466194bf590f81c35c8e44 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 21 Jan 2025 21:19:32 +0100 Subject: [PATCH 4/5] Update sdl2_renderer.cpp --- src/backends/sdl2_renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/sdl2_renderer.cpp b/src/backends/sdl2_renderer.cpp index cb0dba7..843069f 100644 --- a/src/backends/sdl2_renderer.cpp +++ b/src/backends/sdl2_renderer.cpp @@ -74,7 +74,7 @@ int queryDriver(const Context &ctx, const std::string_view &driverType) { for (int i = 0; i < numRenderDrivers; ++i) { SDL_RendererInfo info; SDL_GetRenderDriverInfo(i, &info); - if (strncmp(driverType.data(), info.name, driverType.size()) == 0) { + if (driverType == std::string(info.name)) { found = i; break; } From bb26562955ac3e73e121d29e3866d6ff25597193 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 21 Jan 2025 21:22:33 +0100 Subject: [PATCH 5/5] Update sdl2_renderer.cpp --- src/backends/sdl2_renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/sdl2_renderer.cpp b/src/backends/sdl2_renderer.cpp index 843069f..db733d6 100644 --- a/src/backends/sdl2_renderer.cpp +++ b/src/backends/sdl2_renderer.cpp @@ -264,7 +264,7 @@ ret_code Renderer::initScreen(Context &ctx, int32_t x, int32_t y, int32_t w, int return ErrorCode; } - const int driverIndex = queryDriver(ctx, std__string("opengl")); + const int driverIndex = queryDriver(ctx, std::string("opengl")); if (driverIndex == -1) { ctx.mLogger(LogSeverity::Error, "Cannot open opengl driver"); return ErrorCode;