Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 05:13:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

debughlp.cpp: Use ovectorstream instead of static char array and sprintf

Browse Source
This commit is contained in:
AJR 2023-02-12 15:36:45 -05:00
parent f742bef06a
commit 3266d4ef37
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emu/debug/debughlp.cpp
View File

@ -2023,10 +2023,12 @@ private:
help_map m_help_list; help_map m_help_list;
help_item const *m_uncached_help = std::begin(f_static_help_list); help_item const *m_uncached_help = std::begin(f_static_help_list);
util::ovectorstream m_message_buffer;
help_manager() = default; help_manager() = default;
public: public:
char const *find(std::string_view tag) std::string_view find(std::string_view tag)
{ {
// find a cached exact match if possible // find a cached exact match if possible
std::string const lower = strmakelower(tag); std::string const lower = strmakelower(tag);
@ -2062,16 +2064,17 @@ public:
if ((m_help_list.end() == next) || (next->first.substr(0, lower.length()) != lower)) if ((m_help_list.end() == next) || (next->first.substr(0, lower.length()) != lower))
return candidate->second; return candidate->second;
// TODO: pointers to static strings are bad, mmmkay? m_message_buffer.clear();
static char ambig_message[1024]; m_message_buffer.reserve(1024);
int msglen = std::sprintf(ambig_message, "Ambiguous help request, did you mean:\n"); m_message_buffer.seekp(0, util::ovectorstream::beg);
m_message_buffer << "Ambiguous help request, did you mean:\n";
do do
{ {
msglen += std::sprintf(&ambig_message[msglen], " help %.*s?\n", int(candidate->first.length()), &candidate->first[0]); util::stream_format(m_message_buffer, " help %.*s?\n", int(candidate->first.length()), &candidate->first[0]);
++candidate; ++candidate;
} }
while ((m_help_list.end() != candidate) && (candidate->first.substr(0, lower.length()) == lower)); while ((m_help_list.end() != candidate) && (candidate->first.substr(0, lower.length()) == lower));
return ambig_message; return util::buf_to_string_view(m_message_buffer);
} }
// take the first help entry if no matches at all // take the first help entry if no matches at all
@ -2093,7 +2096,7 @@ public:
PUBLIC INTERFACE PUBLIC INTERFACE
***************************************************************************/ ***************************************************************************/
const char *debug_get_help(std::string_view tag) std::string_view debug_get_help(std::string_view tag)
{ {
return help_manager::instance().find(tag); return help_manager::instance().find(tag);
} }

2
src/emu/debug/debughlp.h
View File

@ -21,6 +21,6 @@
***************************************************************************/ ***************************************************************************/
// help management // help management
const char *debug_get_help(std::string_view tag); std::string_view debug_get_help(std::string_view tag);
#endif // MAME_EMU_DEBUG_DEBUGHLP_H #endif // MAME_EMU_DEBUG_DEBUGHLP_H