diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/testtext.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gtk/testtext.c b/gtk/testtext.c index 4eaf62b75c..50da85b6d2 100644 --- a/gtk/testtext.c +++ b/gtk/testtext.c @@ -638,22 +638,14 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename) while (!feof (f)) { gint count; - char *leftover, *next; + const char *leftover; int to_read = 2047 - remaining; count = fread (buf + remaining, 1, to_read, f); buf[count + remaining] = '\0'; - leftover = next = buf; - while (next) - { - leftover = next; - if (!*leftover) - break; - - next = g_utf8_find_next_char (next, buf + count + remaining); - } - + g_utf8_validate (buf, -1, &leftover); + g_assert (g_utf8_validate (buf, leftover - buf, NULL)); gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf); |