From bc0146c2038c46f789a246d5616afd7c425157f3 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 14 Feb 2021 11:05:57 -0500 Subject: Eliminate ARRAY_LENGTH template in favor of C++17's std::size * osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef --- src/lib/util/plaparse.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/util/plaparse.cpp') diff --git a/src/lib/util/plaparse.cpp b/src/lib/util/plaparse.cpp index 76fbbad6983..09b7724375e 100644 --- a/src/lib/util/plaparse.cpp +++ b/src/lib/util/plaparse.cpp @@ -12,8 +12,6 @@ #include "plaparse.h" -#include "osdcomm.h" - #include #include #include @@ -214,11 +212,11 @@ static bool process_field(jed_data *data, const uint8_t **src, const uint8_t *sr // find keyword char dest[0x10]; - memset(dest, 0, ARRAY_LENGTH(dest)); + memset(dest, 0, sizeof(dest)); const uint8_t *seek = *src; int destptr = 0; - while (seek < srcend && isalpha(*seek) && destptr < ARRAY_LENGTH(dest) - 1) + while (seek < srcend && isalpha(*seek) && destptr < sizeof(dest) - 1) { dest[destptr] = tolower(*seek); seek++; -- cgit v1.2.3-70-g09d2