mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-05-30 11:21:15 -03:00
Removal of more lingering wcs2str()
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user