summaryrefslogtreecommitdiffstats
path: root/modules/mono/utils/string_utils.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-11-16 22:44:13 +0100
committerGitHub <noreply@github.com>2019-11-16 22:44:13 +0100
commit6cde380cee74a136710006d6d05c5dcccc032a39 (patch)
treeba7bc1d19f4f735773714548ba86c16ce8c17c6d /modules/mono/utils/string_utils.cpp
parent98caeb635c2e4d48e0d6d6dbd82af183ab83f894 (diff)
parent8cbe4a3db49f61992a978d2311455377bb3a9656 (diff)
downloadredot-engine-6cde380cee74a136710006d6d05c5dcccc032a39.tar.gz
Merge pull request #33603 from neikeq/ばか
Mono/C#: WebAssembly and initial AOT support
Diffstat (limited to 'modules/mono/utils/string_utils.cpp')
-rw-r--r--modules/mono/utils/string_utils.cpp24
1 files changed, 20 insertions, 4 deletions
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp
index e9efc7626d..88366a6a03 100644
--- a/modules/mono/utils/string_utils.cpp
+++ b/modules/mono/utils/string_utils.cpp
@@ -216,6 +216,25 @@ String str_format(const char *p_format, ...) {
#endif
String str_format(const char *p_format, va_list p_list) {
+ char *buffer = str_format_new(p_format, p_list);
+
+ String res(buffer);
+ memdelete_arr(buffer);
+
+ return res;
+}
+
+char *str_format_new(const char *p_format, ...) {
+ va_list list;
+
+ va_start(list, p_format);
+ char *res = str_format_new(p_format, list);
+ va_end(list);
+
+ return res;
+}
+
+char *str_format_new(const char *p_format, va_list p_list) {
va_list list;
va_copy(list, p_list);
@@ -230,8 +249,5 @@ String str_format(const char *p_format, va_list p_list) {
gd_vsnprintf(buffer, len, p_format, list);
va_end(list);
- String res(buffer);
- memdelete_arr(buffer);
-
- return res;
+ return buffer;
}