--- psiconv/trunk/lib/psiconv/common.h	2000/12/23 20:21:40	72
+++ psiconv/trunk/lib/psiconv/common.h	2004/02/04 12:19:09	196
@@ -1,6 +1,6 @@
 /*
     common.h - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999, 2000  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1999, 2000-2004  Frodo Looijaard <frodol@dds.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,25 +24,23 @@
 #define PSICONV_COMMON_H
 
 #include <psiconv/general.h>
-#include <psiconv/list.h>
+#include <psiconv/configuration.h>
+#include <psiconv/unicode.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-typedef psiconv_list psiconv_buffer; /* of u8 */
-
-#define psiconv_new_buffer() psiconv_list_new(sizeof(psiconv_u8))
-#define psiconv_free_buffer(buf) psiconv_list_free(buf)
-
 /* ***************
    * misc.c *
    *************** */
 
-/* This function returns a copy of a string, that contains no ASCII codes
-   that are not printable. You should free this string yourself when you are
+/* This function returns a copy of a Unicode string, converted to plain ASCII.
+   Anything codepage dependent (> 128) is sanitized away.
+   You should free this string yourself when you are
    done with it. Returns NULL if there is not enough memory left. */
-extern char *psiconv_make_printable(const char *s);
+extern char *psiconv_make_printable(const psiconv_config config,
+                                    const psiconv_string_t s);
 
 
 /* **************