=================================================================== RCS file: /cvs/mandoc/libmdoc.h,v retrieving revision 1.25 retrieving revision 1.28 diff -u -p -r1.25 -r1.28 --- mandoc/libmdoc.h 2009/08/20 08:59:12 1.25 +++ mandoc/libmdoc.h 2009/09/24 15:01:06 1.28 @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.25 2009/08/20 08:59:12 kristaps Exp $ */ +/* $Id: libmdoc.h,v 1.28 2009/09/24 15:01:06 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -27,7 +27,6 @@ enum mdoc_next { struct mdoc { void *data; struct mdoc_cb cb; - void *htab; int flags; #define MDOC_HALT (1 << 0) /* Error in parse. Halt. */ #define MDOC_LITERAL (1 << 1) /* In a literal scope. */ @@ -93,6 +92,7 @@ enum merr { EQUOTPHR, ENOCTX, ELIB, + EBADCHILD, MERRMAX }; @@ -139,9 +139,8 @@ int mdoc_tail_alloc(struct mdoc *, int, int, int); int mdoc_body_alloc(struct mdoc *, int, int, int); void mdoc_node_free(struct mdoc_node *); void mdoc_node_freelist(struct mdoc_node *); -void *mdoc_hash_alloc(void); -int mdoc_hash_find(const void *, const char *); -void mdoc_hash_free(void *); +void mdoc_hash_init(void); +int mdoc_hash_find(const char *); int mdoc_iscdelim(char); int mdoc_isdelim(const char *); size_t mdoc_isescape(const char *); @@ -172,9 +171,9 @@ int mdoc_args(struct mdoc *, int, int *, char *, int, char **); int mdoc_zargs(struct mdoc *, int, int *, char *, int, char **); -#define ARGS_DELIM (1 << 1) -#define ARGS_TABSEP (1 << 2) -#define ARGS_NOWARN (1 << 3) +#define ARGS_DELIM (1 << 1) /* See args(). */ +#define ARGS_TABSEP (1 << 2) /* See args(). */ +#define ARGS_NOWARN (1 << 3) /* See args(). */ #define ARGS_ERROR (-1) #define ARGS_EOLN (0) #define ARGS_WORD (1)