--- a/src/lib/unichar.h	Sat Dec 08 15:45:17 2007 +0200
+++ b/src/lib/unichar.h	Sat Dec 08 15:53:15 2007 +0200
@@ -40,11 +40,10 @@
 int uni_utf8_to_decomposed_titlecase(const void *input, size_t max_len,
 				     buffer_t *output);
 
-/* If input contains only valid UTF-8 input, return it directly. If input
-   contains invalid UTF-8 input, write only valid UTF-8 characters to the
-   given buffer and return it. */
-const unsigned char *
-uni_utf8_get_valid_data(const unsigned char *input, size_t size,
-			buffer_t *tmpbuf, size_t *output_size_r);
+/* If input contains only valid UTF-8 characters, return TRUE. If input
+   contains invalid UTF-8 characters, write only the valid ones to buf and
+   return FALSE. */
+bool uni_utf8_get_valid_data(const unsigned char *input, size_t size,
+			     buffer_t *buf);
 
 #endif