From 54f8b3ae5df6736c58b2a8398f9ac85da425c96d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 22 Apr 2015 11:30:19 +0200 Subject: moved all to std::string (nw) --- src/osd/modules/lib/osdobj_common.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/osd/modules/lib/osdobj_common.c') 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 &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())); } -- cgit v1.2.3-70-g09d2