diff options
| author | 2021-01-20 17:46:03 -0500 | |
|---|---|---|
| committer | 2021-01-20 18:06:15 -0500 | |
| commit | 91921618c2e06bd0ed073b8efccd31a127c9012d (patch) | |
| tree | d3958b32d8db82540cd31083766b22991eb8e8ae /src/tools/split.cpp | |
| parent | c691b79cce315acdfabe1901cb2b5a1e39957bc1 (diff) | |
Much more core std::string_view modernization
- Remove corestr.h from emu.h; update a few source files to not use it at all
- Change strtrimspace, strtrimrightspace and core_filename_extract_* to be pure functions taking a std::string_view by value and returning the same type
- Change strmakeupper and strmakelower to be pure functions taking a std::string_view and constructing a std::string
- Remove the string-modifying version of zippath_parent
- Change tag-based lookup functions in device_t to take std::string_view instead of const std::string & or const char *
- Remove the subdevice tag cache from device_t (since device finders are now recommended) and replace it with a map covering directly owned subdevices only
- Move the working directory setup method out of device_image_interface (only the UI seems to actually use the full version of this)
- Change output_manager to use std::string_view for output name arguments
- Change core_options to accept std::string_view for most name and value arguments (return values are still C strings for now)
- Change miscellaneous other functions to accept std::string_view arguments
- Remove a few string accessor macros from romload.h
- Remove many unnecessary c_str() calls from logging/error messages
Diffstat (limited to 'src/tools/split.cpp')
| -rw-r--r-- | src/tools/split.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/tools/split.cpp b/src/tools/split.cpp index c3f4489f225..f8a8eb79234 100644 --- a/src/tools/split.cpp +++ b/src/tools/split.cpp @@ -236,8 +236,7 @@ static int join_file(const char *filename, const char *outname, int write_output fprintf(stderr, "Fatal error: corrupt or incomplete split file at line:\n%s\n", buffer); goto cleanup; } - outfilename.assign(buffer + 10); - strtrimspace(outfilename); + outfilename.assign(strtrimspace(buffer + 10)); // compute the base path basepath.assign(filename); @@ -295,8 +294,7 @@ static int join_file(const char *filename, const char *outname, int write_output goto cleanup; } expectedhash.assign(buffer + 5, SHA1_DIGEST_SIZE * 2); - infilename.assign(buffer + 5 + SHA1_DIGEST_SIZE * 2 + 6); - strtrimspace(infilename); + infilename.assign(strtrimspace(buffer + 5 + SHA1_DIGEST_SIZE * 2 + 6)); printf(" Reading file '%s'...", infilename.c_str()); |
