From 115db95642ad6d861aad63775b92350e0491f2dd Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 10 Jan 2016 16:36:18 -0500 Subject: Return std::string objects by value rather than pass by reference - strprintf is unaltered, but strformat now takes one fewer argument - state_string_export still fills a buffer, but has been made const - get_default_card_software now takes no arguments but returns a string --- src/lib/formats/cbm_crt.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/formats/cbm_crt.cpp') diff --git a/src/lib/formats/cbm_crt.cpp b/src/lib/formats/cbm_crt.cpp index d169d0c2fd7..6484dbf108c 100644 --- a/src/lib/formats/cbm_crt.cpp +++ b/src/lib/formats/cbm_crt.cpp @@ -122,7 +122,7 @@ static const char * CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] = // cbm_crt_get_card - get slot interface card //------------------------------------------------- -void cbm_crt_get_card(std::string &result, core_file *file) +std::string cbm_crt_get_card(core_file *file) { // read the header cbm_crt_header header; @@ -132,11 +132,10 @@ void cbm_crt_get_card(std::string &result, core_file *file) { UINT16 hardware = pick_integer_be(header.hardware, 0, 2); - result.assign(CRT_C64_SLOT_NAMES[hardware]); - return; + return std::string(CRT_C64_SLOT_NAMES[hardware]); } - result.clear(); + return std::string(); } -- cgit v1.2.3-70-g09d2