diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2024-11-14 19:35:45 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2024-11-14 19:35:45 +0100 |
| commit | df5520aa2dae5b3ce7abf8733dcdd152898af163 (patch) | |
| tree | 00d3047bfb14f682bfb5a21010c731ed649bfed7 /app/tools/halibut/wcwidth.c | |
| parent | df247efec654e512242e4f4f1b0212034f9e01fe (diff) | |
| parent | ec3c0f6f6e7153fa797dc57a0e95779cbc63a23b (diff) | |
Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1
Diffstat (limited to 'app/tools/halibut/wcwidth.c')
| -rw-r--r-- | app/tools/halibut/wcwidth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/tools/halibut/wcwidth.c b/app/tools/halibut/wcwidth.c index 269359f..0ffe9dd 100644 --- a/app/tools/halibut/wcwidth.c +++ b/app/tools/halibut/wcwidth.c @@ -144,12 +144,13 @@ int ustrwid(wchar_t const *s, int charset) wid = 0; while (len > 0) { - int err, ret; + int err; +// int ret; wchar_t const *s_orig; err = 0; s_orig = s; - ret = charset_from_unicode(&s, &len, buf, lenof(buf), + /*ret =*/ charset_from_unicode(&s, &len, buf, lenof(buf), charset, &state, &err); wid += wcswidth(s_orig, s - s_orig); if (err) { @@ -165,7 +166,7 @@ int ustrwid(wchar_t const *s, int charset) int strwid(char const *s, int charset) { wchar_t buf[256]; - int wid, len = strlen(s); + int wid, len = (int)strlen(s); charset_state state = CHARSET_INIT_STATE; wid = 0; |