diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-31 07:42:04 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-31 07:42:04 +0000 |
| commit | a12f0f0bcfd4c67c0c4b89f7e99eebe364ac9b92 (patch) | |
| tree | f4b373c596d554928df76ffee7cae2da35819564 | |
| parent | d8f04423aa0185697ac4ab7b182532f8f02b5de7 (diff) | |
| download | mandoc-a12f0f0bcfd4c67c0c4b89f7e99eebe364ac9b92.tar.gz | |
Re-adjusting UGLY tags.
Fixed removed assignment of type.
Removed superfluous checks of mdoc_argflags (from days when comments were a macro tag).
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mdoc.c | 1 | ||||
| -rw-r--r-- | mdoc_argv.c | 1 | ||||
| -rw-r--r-- | mdoc_macro.c | 6 |
4 files changed, 4 insertions, 6 deletions
@@ -13,7 +13,7 @@ INSTALL_MAN = $(INSTALL_DATA) VERSION = 1.9.21 VDATE = 31 March 2010 -VFLAGS = -DVERSION="\"$(VERSION)\"" -DHAVE_CONFIG_H -DUGLY +VFLAGS = -DVERSION="\"$(VERSION)\"" -DHAVE_CONFIG_H WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings CFLAGS += -g $(VFLAGS) $(WFLAGS) #CFLAGS += -DOSNAME="\"OpenBSD 4.5\"" @@ -436,6 +436,7 @@ node_alloc(struct mdoc *m, int line, int pos, p->line = line; p->pos = pos; p->tok = tok; + p->type = type; return(p); } diff --git a/mdoc_argv.c b/mdoc_argv.c index b61c8b9a..f1be3755 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -336,7 +336,6 @@ mdoc_args(struct mdoc *m, int line, int *pos, int fl, c, i; struct mdoc_node *n; - assert(tok && tok < MDOC_MAX); fl = mdoc_argflags[tok]; if (MDOC_It != tok) diff --git a/mdoc_macro.c b/mdoc_macro.c index 97bda380..5c8081ec 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -538,10 +538,8 @@ rew_dobreak(enum mdoct tok, const struct mdoc_node *p) return(1); break; case (MDOC_Oc): -#ifdef UGLY if (MDOC_Op == p->tok) return(1); -#endif break; default: break; @@ -881,7 +879,9 @@ blk_full(MACRO_PROT_ARGS) int c, la; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ +#ifdef UGLY struct mdoc_node *n; +#endif char *p; /* Close out prior implicit scope. */ @@ -1102,7 +1102,6 @@ blk_part_imp(MACRO_PROT_ARGS) body = m->last; } -#ifdef UGLY /* * If we can't rewind to our body, then our scope has already * been closed by another macro (like `Oc' closing `Op'). This @@ -1112,7 +1111,6 @@ blk_part_imp(MACRO_PROT_ARGS) for (n = m->last; n; n = n->parent) if (body == n) break; -#endif if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) return(0); |