Skip to content
Browse files

Removal of more lingering wcs2str()

  • Loading branch information...
1 parent cc5c411 commit 3bf88110aa9a39f530680b4f72bca29be0637e5b @ridiculousfish ridiculousfish committed
Showing with 7 additions and 8 deletions.
  1. +3 −4 fallback.cpp
  2. +4 −4 wutil.cpp
View
7 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;
}
View
8 wutil.cpp
@@ -330,16 +330,16 @@ wchar_t *wrealpath(const wcstring &pathname, wchar_t *resolved_path)
if (!narrow_res)
return 0;
-
+
+ const wcstring wide_res = str2wcstring(narrow_res);
if (resolved_path)
{
- wcstring tmp2 = str2wcstring(narrow_res);
- wcslcpy(resolved_path, tmp2.c_str(), PATH_MAX);
+ wcslcpy(resolved_path, wide_res.c_str(), PATH_MAX);
res = resolved_path;
}
else
{
- res = wcsdup(str2wcstring(narrow_res).c_str());
+ res = wcsdup(wide_res.c_str());
}
return res;
}

0 comments on commit 3bf8811

Please sign in to comment.
Something went wrong with that request. Please try again.