Remove a bunch of unused variables spotted by Ubuntu 12.04's gcc.

[sgt/halibut] / wcwidth.c

diff --git a/wcwidth.c b/wcwidth.c
index 269359f..bc4ae7f 100644 (file)
--- a/wcwidth.c
+++ b/wcwidth.c
@@ -144,13 +144,12 @@ int ustrwid(wchar_t const *s, int charset)
     wid = 0;
 
     while (len > 0) {
-       int err, ret;
+       int err;
        wchar_t const *s_orig;
 
        err = 0;
        s_orig = s;
-       ret = charset_from_unicode(&s, &len, buf, lenof(buf),
-                                  charset, &state, &err);
+        charset_from_unicode(&s, &len, buf, lenof(buf), charset, &state, &err);
        wid += wcswidth(s_orig, s - s_orig);
        if (err) {
            assert(len > 0 && *s);