aboutsummaryrefslogtreecommitdiffhomepage
path: root/wutil.cpp
diff options
context:
space:
mode:
authorGravatar Daniel James <dnljms@gmail.com>2012-12-24 12:25:04 +0000
committerGravatar Daniel James <dnljms@gmail.com>2012-12-24 12:25:04 +0000
commitcc5c4110396cc92eef0161b398d5658cd86d682a (patch)
tree937834db1775ce5d79545bda0926050bd668b1a9 /wutil.cpp
parent37bdb2009265b401aa1af64336d122949ff5d22b (diff)
Remove leftover use of str2wcs.
Diffstat (limited to 'wutil.cpp')
-rw-r--r--wutil.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/wutil.cpp b/wutil.cpp
index 5984747a..978b7e0a 100644
--- a/wutil.cpp
+++ b/wutil.cpp
@@ -333,14 +333,13 @@ wchar_t *wrealpath(const wcstring &pathname, wchar_t *resolved_path)
if (resolved_path)
{
- wchar_t *tmp2 = str2wcs(narrow_res);
- wcslcpy(resolved_path, tmp2, PATH_MAX);
- free(tmp2);
+ wcstring tmp2 = str2wcstring(narrow_res);
+ wcslcpy(resolved_path, tmp2.c_str(), PATH_MAX);
res = resolved_path;
}
else
{
- res = str2wcs(narrow_res);
+ res = wcsdup(str2wcstring(narrow_res).c_str());
}
return res;
}