summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/corestr.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-01-27 08:35:08 +0100
committer ImJezze <jezze@gmx.net>2016-01-27 08:35:08 +0100
commit0d1e14b771ed72d8e9a0d42fd05ebfe6fe63016a (patch)
tree10258b6f255e00e7eec2ec30112d6de07015c475 /src/lib/util/corestr.cpp
parent8d5848718c30a960d07d569937cb1678f75f0463 (diff)
parentb1d6f6d63f8294a3f62d7db6f9eea07da1d93664 (diff)
Merge pull request #10 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/util/corestr.cpp')
-rw-r--r--src/lib/util/corestr.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/util/corestr.cpp b/src/lib/util/corestr.cpp
index 336d788cabb..ce5976869d4 100644
--- a/src/lib/util/corestr.cpp
+++ b/src/lib/util/corestr.cpp
@@ -217,14 +217,13 @@ int strprintf(std::string &str, const char *format, ...)
return retVal;
}
-std::string strformat(std::string &str, const char *format, ...)
+std::string strformat(const char *format, ...)
{
std::string retVal;
va_list ap;
va_start(ap, format);
- strvprintf(str, format, ap);
+ strvprintf(retVal, format, ap);
va_end(ap);
- retVal.assign(str);
return retVal;
}