From ea6ed8eb4a9349ba679125913c5a03c1027783b2 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Wed, 31 Mar 2010 07:13:53 +0000 Subject: Macro types enum-ated (enum mdoct) (for easier debugging in gdb of "tok" values). Initial check-in of Ingo Schwarze's patch for Xo/Xc handling (in blocks ifdef'd "UGLY"). Put Oc-close-Op parts into UGLY ifdef blocks. --- mdoc_argv.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'mdoc_argv.c') diff --git a/mdoc_argv.c b/mdoc_argv.c index 55cb0668..404a097a 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_argv.c,v 1.34 2010/03/29 19:28:04 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.35 2010/03/31 07:13:53 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -44,7 +44,7 @@ #define MULTI_STEP 5 -static int argv_a2arg(int, const char *); +static int argv_a2arg(enum mdoct, const char *); static int args(struct mdoc *, int, int *, char *, int, char **); static int argv(struct mdoc *, int, @@ -218,7 +218,7 @@ static int mdoc_argflags[MDOC_MAX] = { * one mandatory value, an optional single value, or no value. */ int -mdoc_argv(struct mdoc *m, int line, int tok, +mdoc_argv(struct mdoc *m, int line, enum mdoct tok, struct mdoc_arg **v, int *pos, char *buf) { char *p, sv; @@ -330,13 +330,14 @@ mdoc_zargs(struct mdoc *m, int line, int *pos, int -mdoc_args(struct mdoc *m, int line, - int *pos, char *buf, int tok, char **v) +mdoc_args(struct mdoc *m, int line, int *pos, + char *buf, enum mdoct tok, char **v) { int fl, c, i; struct mdoc_node *n; - fl = (0 == tok) ? 0 : mdoc_argflags[tok]; + assert(tok && tok < MDOC_MAX); + fl = mdoc_argflags[tok]; if (MDOC_It != tok) return(args(m, line, pos, buf, fl, v)); @@ -552,7 +553,7 @@ args(struct mdoc *m, int line, int *pos, static int -argv_a2arg(int tok, const char *p) +argv_a2arg(enum mdoct tok, const char *p) { /* -- cgit v1.2.3-56-ge451