diff --git a/utf8.c b/utf8.c index 56281aa2..eadefa11 100644 --- a/utf8.c +++ b/utf8.c @@ -32,16 +32,10 @@ static int utf8_width(wchar_t); void utf8_set(struct utf8_data *ud, u_char ch) { - u_int i; + static const struct utf8_data empty = { { 0 }, 1, 1, 1 }; + memcpy(ud, &empty, sizeof *ud); *ud->data = ch; - ud->have = 1; - ud->size = 1; - - ud->width = 1; - - for (i = ud->size; i < sizeof ud->data; i++) - ud->data[i] = '\0'; } /* Copy UTF-8 character. */