--- psiconv/trunk/lib/psiconv/parse_routines.h 2003/11/25 17:57:05 168 +++ psiconv/trunk/lib/psiconv/parse_routines.h 2004/02/04 12:19:09 196 @@ -1,6 +1,6 @@ /* parse_routines.h - Part of psiconv, a PSION 5 file formats converter - Copyright (c) 1999, 2000 Frodo Looijaard + Copyright (c) 1999-2004 Frodo Looijaard 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 @@ -20,11 +20,12 @@ #ifndef PSICONV_PARSE_ROUTINES_H #define PSICONV_PARSE_ROUTINES_H +#include #include #include #include #include -#include +#include #ifdef __cplusplus extern "C" { @@ -48,10 +49,10 @@ const psiconv_buffer buf,int lev, psiconv_u32 off, int *length, int *status); -extern psiconv_S_t psiconv_read_S(const psiconv_config config, +extern psiconv_u32 psiconv_read_S(const psiconv_config config, const psiconv_buffer buf, int lev, psiconv_u32 off, int *length, int *status); -extern psiconv_X_t psiconv_read_X(const psiconv_config config, +extern psiconv_u32 psiconv_read_X(const psiconv_config config, const psiconv_buffer buf, int lev, psiconv_u32 off, int *length, int *status); extern psiconv_length_t psiconv_read_length(const psiconv_config config, @@ -70,6 +71,10 @@ const psiconv_buffer buf, int lev,psiconv_u32 off, int *length,int *status); +extern psiconv_string_t psiconv_read_charlist(const psiconv_config config, + const psiconv_buffer buf, int lev, + psiconv_u32 off, int nrofchars, + int *status); extern int psiconv_parse_bool(const psiconv_config config, const psiconv_buffer buf, int lev,