From 0c8dbef887e8a968213e8f5e23a74b2c9fef916f Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 17 Sep 2023 14:08:30 -0400 Subject: fsmgr.cpp: Restore trim_end_spaces as a std::string_view function and use it in place of strtrimrightspace in FS code due to feedback on f5066881db7a601ba7031fbc996ab404e05e5dd5 --- src/lib/formats/fs_coco_rsdos.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/formats/fs_coco_rsdos.cpp') diff --git a/src/lib/formats/fs_coco_rsdos.cpp b/src/lib/formats/fs_coco_rsdos.cpp index c5ab89036a4..16642aa15a0 100644 --- a/src/lib/formats/fs_coco_rsdos.cpp +++ b/src/lib/formats/fs_coco_rsdos.cpp @@ -10,7 +10,6 @@ #include "fs_coco_rsdos.h" #include "coco_rawdsk.h" -#include "util/corestr.h" #include "util/strformat.h" #include @@ -415,8 +414,8 @@ meta_data coco_rsdos_impl::get_metadata_from_dirent(const rsdos_dirent &dirent) std::string coco_rsdos_impl::get_filename_from_dirent(const rsdos_dirent &dirent) { - std::string_view stem = strtrimrightspace(std::string_view(&dirent.m_filename[0], 8)); - std::string_view ext = strtrimrightspace(std::string_view(&dirent.m_filename[8], 3)); + std::string_view stem = trim_end_spaces(std::string_view(&dirent.m_filename[0], 8)); + std::string_view ext = trim_end_spaces(std::string_view(&dirent.m_filename[8], 3)); return util::string_format("%s.%s", stem, ext); } -- cgit v1.2.3-70-g09d2