diff options
author | 2023-09-17 14:08:30 -0400 | |
---|---|---|
committer | 2023-09-17 14:08:57 -0400 | |
commit | 0c8dbef887e8a968213e8f5e23a74b2c9fef916f (patch) | |
tree | 69d54c6ac9acfcc8a77e7dc5ceb66b679b3f8930 /src/lib/formats/fs_vtech.cpp | |
parent | 01040b1e0ce4d6f74de97de5c47ea6d8cf12ab48 (diff) |
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
Diffstat (limited to 'src/lib/formats/fs_vtech.cpp')
-rw-r--r-- | src/lib/formats/fs_vtech.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/formats/fs_vtech.cpp b/src/lib/formats/fs_vtech.cpp index 970d5fb6556..cea8d4c15fa 100644 --- a/src/lib/formats/fs_vtech.cpp +++ b/src/lib/formats/fs_vtech.cpp @@ -6,7 +6,6 @@ #include "fs_vtech.h" #include "vt_dsk.h" -#include "corestr.h" #include "multibyte.h" #include <stdexcept> @@ -142,7 +141,7 @@ meta_data vtech_impl::file_metadata(const u8 *entry) { meta_data res; - res.set(meta_name::name, strtrimrightspace(rstr(entry+2, 8))); + res.set(meta_name::name, trim_end_spaces(rstr(entry+2, 8))); res.set(meta_name::basic, entry[0] == 'T'); res.set(meta_name::loading_address, get_u16le(entry + 0xc)); res.set(meta_name::length, ((get_u16le(entry + 0xe) - get_u16le(entry + 0xc) + 1) & 0xffff)); @@ -161,7 +160,7 @@ std::tuple<fsblk_t::block_t, u32> vtech_impl::file_find(std::string_view name) continue; if(bdir.r8(off+1) != ':') continue; - if(strtrimrightspace(bdir.rstr(off+2, 8)) == name) { + if(trim_end_spaces(bdir.rstr(off+2, 8)) == name) { return std::make_tuple(bdir, i); } } |