--- psiconv/trunk/lib/psiconv/parse.h	2000/12/13 00:42:04	61
+++ psiconv/trunk/lib/psiconv/parse.h	2000/12/15 00:21:51	64
@@ -1,6 +1,6 @@
 /*
     parse.h - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1999, 2000  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
@@ -17,12 +17,16 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* Declarations only needed for the parser */
+/* Declarations only needed for the parser. If you want to parse, just
+   include this. */
 
 #ifndef PSICONV_PARSE_H
 #define PSICONV_PARSE_H
 
 #include <psiconv/data.h>
+#include <psiconv/error.h>
+#include <psiconv/list.h>
+#include <psiconv/general.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,20 +37,15 @@
 extern psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,
                                              int *length,
                                              psiconv_header_section *result);
-extern int psiconv_parse(const psiconv_buffer buf,psiconv_file *result);
-
-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;
-
-
-#define PSICONV_VERB_DEBUG 4
-#define PSICONV_VERB_PROGRESS 3
-#define PSICONV_VERB_WARN 2
-#define PSICONV_VERB_FATAL 1
+/* Parses a Psion file. If its return-value is non-zero, something has
+   gone horribly wrong (badly corrupted file, or out of memory, usually),
+   and *result is undefined and unallocated; in normal cases, memory is
+   allocated to it and it is up to you to free it (using psiconv_free_file;
+   this is valid even if (*result)->file equals NULL).
+   Note that (*result)->file may be NULL if this file type is unknown
+   or unsupported!  */
+extern int psiconv_parse(const psiconv_buffer buf,psiconv_file *result);
 
 #ifdef __cplusplus
 }