From e998f2e4ac63415a637177c0ec438b3329f6521b Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Sat, 19 May 2018 08:46:58 +0900 Subject: [PATCH] Terminal: Fix -Werror=class-memaccess Fix -Werror=class-memaccess pointed out by gcc8. * Use TerminalLine::Clear() instead of memset() * Use rgb_color::operator=() instead of memcpy() Change-Id: I41360e245fd55c526d9c2802a2f247ba22583080 Reviewed-on: https://review.haiku-os.org/483 Reviewed-by: Adrien Destugues --- src/apps/terminal/BasicTerminalBuffer.cpp | 2 +- src/apps/terminal/Colors.cpp | 2 +- src/apps/terminal/TerminalBuffer.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apps/terminal/BasicTerminalBuffer.cpp b/src/apps/terminal/BasicTerminalBuffer.cpp index a1f0d10f60..43e3629e2b 100644 --- a/src/apps/terminal/BasicTerminalBuffer.cpp +++ b/src/apps/terminal/BasicTerminalBuffer.cpp @@ -1088,7 +1088,7 @@ BasicTerminalBuffer::_AllocateLines(int32 width, int32 count) _FreeLines(lines, i); return NULL; } - memset(lines[i], 0, size); + lines[i]->Clear(0, width); } return lines; diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp index 7f667e418a..190881d7e1 100644 --- a/src/apps/terminal/Colors.cpp +++ b/src/apps/terminal/Colors.cpp @@ -195,7 +195,7 @@ XColorsTable::LookUpColor(const char* name, rgb_color* color) } if (fTable[right].hash == hash) { - memcpy(color, &fTable[right].color, sizeof(rgb_color)); + *color = fTable[right].color; return B_OK; } diff --git a/src/apps/terminal/TerminalBuffer.cpp b/src/apps/terminal/TerminalBuffer.cpp index 14362d1b11..84c32d83f7 100644 --- a/src/apps/terminal/TerminalBuffer.cpp +++ b/src/apps/terminal/TerminalBuffer.cpp @@ -61,8 +61,8 @@ TerminalBuffer::Init(int32 width, int32 height, int32 historySize) if (fColorsPalette == NULL) return B_NO_MEMORY; - memcpy(fColorsPalette, TermApp::DefaultPalette(), - sizeof(rgb_color) * kTermColorCount); + for (uint i = 0; i < kTermColorCount; i++) + fColorsPalette[i] = TermApp::DefaultPalette()[i]; return BasicTerminalBuffer::Init(width, height, historySize); }