=================================================================== RCS file: /cvs/mandoc/Attic/private.h,v retrieving revision 1.42 retrieving revision 1.44 diff -u -p -r1.42 -r1.44 --- mandoc/Attic/private.h 2008/12/15 03:13:01 1.42 +++ mandoc/Attic/private.h 2008/12/23 05:30:49 1.44 @@ -1,4 +1,4 @@ -/* $Id: private.h,v 1.42 2008/12/15 03:13:01 kristaps Exp $ */ +/* $Id: private.h,v 1.44 2008/12/23 05:30:49 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,7 +27,7 @@ struct mdoc { void *htab; struct mdoc_node *last; struct mdoc_node *first; - + struct mdoc_meta meta; enum mdoc_sec sec_lastn; enum mdoc_sec sec_last; }; @@ -41,6 +41,9 @@ struct mdoc_macro { extern const struct mdoc_macro *const mdoc_macros; +#define MACRO_PROT_ARGS struct mdoc *mdoc, int tok, \ + int ppos, int *pos, char *buf + __BEGIN_DECLS int mdoc_err(struct mdoc *, int, int, enum mdoc_err); @@ -60,10 +63,33 @@ void mdoc_body_alloc(struct mdoc *, int, int); void mdoc_node_free(struct mdoc_node *); void mdoc_sibling(struct mdoc *, int, struct mdoc_node **, struct mdoc_node **, struct mdoc_node *); -void *mdoc_hash_alloc(void); -int mdoc_hash_find(const void *, const char *); -void mdoc_hash_free(void *); +void *mdoc_tokhash_alloc(void); +int mdoc_tokhash_find(const void *, const char *); +void mdoc_tokhash_free(void *); int mdoc_isdelim(const char *); +enum mdoc_sec mdoc_atosec(size_t, const char **); +enum mdoc_msec mdoc_atomsec(const char *); +enum mdoc_vol mdoc_atovol(const char *); +enum mdoc_arch mdoc_atoarch(const char *); +time_t mdoc_atotime(const char *); + +int mdoc_argv_lookup(int, const char *); +int mdoc_argv_parse(struct mdoc *, int, + int, struct mdoc_arg *, int *, char *); +void mdoc_argv_free(int, struct mdoc_arg *); + +int xstrlcat(char *, const char *, size_t); +int xstrlcpy(char *, const char *, size_t); +int xstrcmp(const char *, const char *); +void *xcalloc(size_t, size_t); +char *xstrdup(const char *); + +int macro_text(MACRO_PROT_ARGS); +int macro_scoped_implicit(MACRO_PROT_ARGS); +int macro_scoped_explicit(MACRO_PROT_ARGS); +int macro_prologue_ddate(MACRO_PROT_ARGS); +int macro_prologue_dtitle(MACRO_PROT_ARGS); +int macro_prologue_os(MACRO_PROT_ARGS); __END_DECLS