diff options
author | 2015-05-02 19:41:03 +0200 | |
---|---|---|
committer | 2015-05-02 19:41:03 +0200 | |
commit | cc3b682e52bf097d31db78032aad01d6a0b12e94 (patch) | |
tree | 860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/osd/modules/lib/osdobj_common.c | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.c')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/osd/modules/lib/osdobj_common.c b/src/osd/modules/lib/osdobj_common.c index 41f9d4396ba..903ee072d36 100644 --- a/src/osd/modules/lib/osdobj_common.c +++ b/src/osd/modules/lib/osdobj_common.c @@ -245,22 +245,22 @@ void osd_common_t::register_options() void osd_common_t::update_option(const char * key, std::vector<const char *> &values) { - astring current_value(m_options.description(key)); - astring new_option_value(""); + std::string current_value(m_options.description(key)); + std::string new_option_value(""); for (unsigned int index = 0; index < values.size(); index++) { - astring t(values[index]); - if (new_option_value.len() > 0) + std::string t(values[index]); + if (new_option_value.length() > 0) { if( index != (values.size()-1)) - new_option_value.cat(", "); + new_option_value.append(", "); else - new_option_value.cat(" or "); + new_option_value.append(" or "); } - new_option_value.cat(t); + new_option_value.append(t); } // TODO: core_strdup() is leaked - m_options.set_description(key, core_strdup(current_value.cat(new_option_value).c_str())); + m_options.set_description(key, core_strdup(current_value.append(new_option_value).c_str())); } |