aboutsummaryrefslogtreecommitdiffhomepage
path: root/fallback.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-12-24 20:55:35 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-12-24 20:55:35 -0800
commit3bf88110aa9a39f530680b4f72bca29be0637e5b (patch)
tree9a2386a583a2948d55a27ee3c46552839b6aa2ab /fallback.cpp
parentcc5c4110396cc92eef0161b398d5658cd86d682a (diff)
Removal of more lingering wcs2str()
Diffstat (limited to 'fallback.cpp')
-rw-r--r--fallback.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/fallback.cpp b/fallback.cpp
index 69348db1..b52a6330 100644
--- a/fallback.cpp
+++ b/fallback.cpp
@@ -276,6 +276,7 @@ static int vgwprintf(void (*writer)(wchar_t),
{
wchar_t *ss=0;
+ wcstring wide_ss;
if (is_long)
{
ss = va_arg(va, wchar_t *);
@@ -286,7 +287,8 @@ static int vgwprintf(void (*writer)(wchar_t),
if (ns)
{
- ss = str2wcs(ns);
+ wide_ss = str2wcstring(ns);
+ ss = wide_ss.c_str();
}
}
@@ -319,9 +321,6 @@ static int vgwprintf(void (*writer)(wchar_t),
count += maxi(width-wcslen(ss), 0);
}
- if (!is_long)
- free(ss);
-
break;
}