diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-03-08 11:41:22 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-03-08 11:41:22 +0000 |
| commit | 056d0c68fbd56e3ce25fe3ad8c58ade0ab30a1b4 (patch) | |
| tree | a2b977b6c334b960dc3df02e4f402667e9314030 /private.h | |
| parent | 7024ee7ca35a8033dee9ec0936cd2f3e0251aca2 (diff) | |
| download | mandoc-056d0c68fbd56e3ce25fe3ad8c58ade0ab30a1b4.tar.gz | |
BROKEN CHECK-IN. Wide-ranging updates.
Removed libmdoc internal argv limit (all dynamic).
Removed "data" union in mdoc_node (to be selectively re-added).
Diffstat (limited to 'private.h')
| -rw-r--r-- | private.h | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -33,6 +33,7 @@ struct mdoc { int linetok; int flags; #define MDOC_HALT (1 << 0) + int pflags; enum mdoc_next next; struct mdoc_node *last; struct mdoc_node *first; @@ -42,14 +43,6 @@ struct mdoc { }; -/* Hard-limit of macro arguments. */ - -#define MDOC_LINEARG_MAX 9 - -/* Suggested limit of macro arguments. */ - -#define MDOC_LINEARG_SOFTMAX 9 - #define MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \ int ppos, int *pos, char *buf @@ -106,13 +99,12 @@ int mdoc_verr(struct mdoc *, int, int, const char *, ...); int mdoc_macro(MACRO_PROT_ARGS); -int mdoc_find(const struct mdoc *, const char *); int mdoc_word_alloc(struct mdoc *, int, int, const char *); int mdoc_elem_alloc(struct mdoc *, int, int, - int, size_t, const struct mdoc_arg *); + int, struct mdoc_arg *); int mdoc_block_alloc(struct mdoc *, int, int, - int, size_t, const struct mdoc_arg *); + int, struct mdoc_arg *); int mdoc_root_alloc(struct mdoc *); int mdoc_head_alloc(struct mdoc *, int, int, int); int mdoc_tail_alloc(struct mdoc *, int, int, int); @@ -141,13 +133,13 @@ int mdoc_valid_post(struct mdoc *); int mdoc_action_pre(struct mdoc *, struct mdoc_node *); int mdoc_action_post(struct mdoc *); -int mdoc_argv(struct mdoc *, int, int, - struct mdoc_arg *, int *, char *); +int mdoc_argv(struct mdoc *, int, int, + struct mdoc_arg **, int *, char *); #define ARGV_ERROR (-1) #define ARGV_EOLN (0) #define ARGV_ARG (1) #define ARGV_WORD (2) -void mdoc_argv_free(int, struct mdoc_arg *); +void mdoc_argv_free(struct mdoc_arg *); int mdoc_args(struct mdoc *, int, int *, char *, int, char **); #define ARGS_ERROR (-1) |