hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2025-12-20 03:40:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

atomic: fix compiler warning with string (#164)

Browse source 
the compiler tries to optimize this and inlines the +=, which might involve raw memcpy operations,
and in doing so, it thinks there is a chance that the internal buffer doesnt have enough space.
use ostringstream instead, and return the string from that.
This commit is contained in:
Tom Englund 2025-04-10 14:47:15 +02:00 • committed by GitHub
parent 1d2dbd72c2
commit c8282f4982
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/backend/drm/impl/Atomic.cpp
View file

@ -5,6 +5,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sstream>
#include "Shared.hpp" #include "Shared.hpp"
#include "aquamarine/output/Output.hpp" #include "aquamarine/output/Output.hpp"
@ -223,20 +224,20 @@ void Aquamarine::CDRMAtomicRequest::addConnectorCursor(Hyprutils::Memory::CShare
bool Aquamarine::CDRMAtomicRequest::commit(uint32_t flagssss) { bool Aquamarine::CDRMAtomicRequest::commit(uint32_t flagssss) {
static auto flagsToStr = [](uint32_t flags) { static auto flagsToStr = [](uint32_t flags) {
std::string result; std::ostringstream result;
if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET)
result += "ATOMIC_ALLOW_MODESET "; result << "ATOMIC_ALLOW_MODESET ";
if (flags & DRM_MODE_ATOMIC_NONBLOCK) if (flags & DRM_MODE_ATOMIC_NONBLOCK)
result += "ATOMIC_NONBLOCK "; result << "ATOMIC_NONBLOCK ";
if (flags & DRM_MODE_ATOMIC_TEST_ONLY) if (flags & DRM_MODE_ATOMIC_TEST_ONLY)
result += "ATOMIC_TEST_ONLY "; result << "ATOMIC_TEST_ONLY ";
if (flags & DRM_MODE_PAGE_FLIP_EVENT) if (flags & DRM_MODE_PAGE_FLIP_EVENT)
result += "PAGE_FLIP_EVENT "; result << "PAGE_FLIP_EVENT ";
if (flags & DRM_MODE_PAGE_FLIP_ASYNC) if (flags & DRM_MODE_PAGE_FLIP_ASYNC)
result += "PAGE_FLIP_ASYNC "; result << "PAGE_FLIP_ASYNC ";
if (flags & (~DRM_MODE_ATOMIC_FLAGS)) if (flags & (~DRM_MODE_ATOMIC_FLAGS))
result += " + invalid..."; result << " + invalid...";
return result; return result.str();
}; };
if (failed) { if (failed) {