--- psiconv/trunk/lib/psiconv/error.h	2000/12/13 16:17:54	62
+++ psiconv/trunk/lib/psiconv/error.h	2003/11/27 11:43:51	173
@@ -21,34 +21,33 @@
 #define PSICONV_ERROR_H
 
 #include <psiconv/general.h>
+#include <psiconv/configuration.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-extern int psiconv_verbosity;
-
-typedef void (*psiconv_error_handler_t) (int kind, psiconv_u32 off,
-                                         const char *message);
-
-extern psiconv_error_handler_t psiconv_error_handler;
-
 /* These functions print error, warning, progress and debug information to
  *    stderr */
-extern void psiconv_fatal(int level, psiconv_u32 off, const char *format,...);
-extern void psiconv_warn(int level, psiconv_u32 off, const char *format,...);
-extern void psiconv_progress(int level, psiconv_u32 off,
+extern void psiconv_fatal(psiconv_config config,int level, psiconv_u32 off, 
+                          const char *format,...);
+extern void psiconv_warn(psiconv_config config,int level, psiconv_u32 off,
+                         const char *format,...);
+extern void psiconv_progress(psiconv_config config,int level, psiconv_u32 off,
                              const char *format,...);
-extern void psiconv_debug(int level, psiconv_u32 off, const char *format,...);
+extern void psiconv_debug(psiconv_config config,int level, psiconv_u32 off,
+                          const char *format,...);
 
 #define PSICONV_VERB_DEBUG 4
 #define PSICONV_VERB_PROGRESS 3
 #define PSICONV_VERB_WARN 2
 #define PSICONV_VERB_FATAL 1
 
+#define PSICONV_E_OK    0
 #define PSICONV_E_OTHER 1
 #define PSICONV_E_NOMEM 2
 #define PSICONV_E_PARSE 3
+#define PSICONV_E_GENERATE 4
 
 #ifdef __cplusplus
 }