diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-23 12:40:04 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-23 12:40:04 +0000 |
| commit | 589f74a138ab93e81b858ebb9a8218a19d5a2017 (patch) | |
| tree | d308e82980fe305f185c5df31a534d64c0501595 /man_macro.c | |
| parent | 74625e09d203b8b3c31182a00609d7b437f942c7 (diff) | |
| download | mandoc-589f74a138ab93e81b858ebb9a8218a19d5a2017.tar.gz mandoc-589f74a138ab93e81b858ebb9a8218a19d5a2017.tar.zst mandoc-589f74a138ab93e81b858ebb9a8218a19d5a2017.zip | |
First, make -man ARGS_EOLN et al. be an enum. Second, remove
ARGS_ERROR, as it is never returned by man_args(). Then clean up
invocations of man_args() to only check for ARGS_EOLN.
Diffstat (limited to 'man_macro.c')
| -rw-r--r-- | man_macro.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/man_macro.c b/man_macro.c index 273f48d0..744167bc 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.58 2011/03/22 14:33:05 kristaps Exp $ */ +/* $Id: man_macro.c,v 1.59 2011/03/23 12:40:04 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -296,7 +296,7 @@ blk_close(MACRO_PROT_ARGS) int blk_exp(MACRO_PROT_ARGS) { - int w, la; + int la; char *p; /* @@ -317,13 +317,8 @@ blk_exp(MACRO_PROT_ARGS) for (;;) { la = *pos; - w = man_args(m, line, pos, buf, &p); - - if (-1 == w) - return(0); - if (0 == w) + if (ARGS_EOLN == man_args(m, line, pos, buf, &p)) break; - if ( ! man_word_alloc(m, line, la, p)) return(0); } @@ -348,7 +343,7 @@ blk_exp(MACRO_PROT_ARGS) int blk_imp(MACRO_PROT_ARGS) { - int w, la; + int la; char *p; struct man_node *n; @@ -372,13 +367,8 @@ blk_imp(MACRO_PROT_ARGS) for (;;) { la = *pos; - w = man_args(m, line, pos, buf, &p); - - if (-1 == w) - return(0); - if (0 == w) + if (ARGS_EOLN == man_args(m, line, pos, buf, &p)) break; - if ( ! man_word_alloc(m, line, la, p)) return(0); } @@ -406,7 +396,7 @@ blk_imp(MACRO_PROT_ARGS) int in_line_eoln(MACRO_PROT_ARGS) { - int w, la; + int la; char *p; struct man_node *n; @@ -417,11 +407,7 @@ in_line_eoln(MACRO_PROT_ARGS) for (;;) { la = *pos; - w = man_args(m, line, pos, buf, &p); - - if (-1 == w) - return(0); - if (0 == w) + if (ARGS_EOLN == man_args(m, line, pos, buf, &p)) break; if ( ! man_word_alloc(m, line, la, p)) return(0); |