diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-24 03:46:02 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-24 03:46:02 +0000 |
| commit | efcc4d089d85c2b28629f9b05e441837f2c1a4f2 (patch) | |
| tree | 176c7737fd37c098b0e852605bf6635e59b0aef2 | |
| parent | a520ef48b70e5c01709c968c95b3f02314515f6f (diff) | |
| download | mandoc-efcc4d089d85c2b28629f9b05e441837f2c1a4f2.tar.gz | |
enum-ised rew_* return values (type-safety).
Removed ignoring of MAN_Vb argument (symmetry).
Removed superfluous utsname inclusion.
| -rw-r--r-- | man_action.c | 2 | ||||
| -rw-r--r-- | man_macro.c | 25 |
2 files changed, 11 insertions, 16 deletions
diff --git a/man_action.c b/man_action.c index b689cd8f..7634b5fd 100644 --- a/man_action.c +++ b/man_action.c @@ -18,8 +18,6 @@ #include "config.h" #endif -#include <sys/utsname.h> - #include <assert.h> #include <stdlib.h> #include <string.h> diff --git a/man_macro.c b/man_macro.c index 3137e375..372c65bc 100644 --- a/man_macro.c +++ b/man_macro.c @@ -25,9 +25,11 @@ #include "libman.h" -#define REW_REWIND (0) /* See rew_scope(). */ -#define REW_NOHALT (1) /* See rew_scope(). */ -#define REW_HALT (2) /* See rew_scope(). */ +enum rew { + REW_REWIND, + REW_NOHALT, + REW_HALT, +}; static int in_line_eoln(MACRO_PROT_ARGS); static int blk_imp(MACRO_PROT_ARGS); @@ -35,9 +37,9 @@ static int blk_close(MACRO_PROT_ARGS); static int rew_scope(enum man_type, struct man *, enum mant); -static int rew_dohalt(enum mant, enum man_type, +static enum rew rew_dohalt(enum mant, enum man_type, const struct man_node *); -static int rew_block(enum mant, enum man_type, +static enum rew rew_block(enum mant, enum man_type, const struct man_node *); const struct man_macro __man_macros[MAN_MAX] = { @@ -104,7 +106,7 @@ man_unscope(struct man *m, const struct man_node *n) } -static int +static enum rew rew_block(enum mant ntok, enum man_type type, const struct man_node *n) { @@ -120,10 +122,10 @@ rew_block(enum mant ntok, enum man_type type, const struct man_node *n) * section (all less sections), and scoped to subsections (all less * sections and subsections). */ -static int +static enum rew rew_dohalt(enum mant tok, enum man_type type, const struct man_node *n) { - int c; + enum rew c; if (MAN_ROOT == n->type) return(REW_HALT); @@ -179,7 +181,7 @@ static int rew_scope(enum man_type type, struct man *m, enum mant tok) { struct man_node *n; - int c; + enum rew c; /* LINTED */ for (n = m->last; n; n = n->parent) { @@ -319,11 +321,6 @@ in_line_eoln(MACRO_PROT_ARGS) return(0); if (0 == w) break; - - /* XXX ignore Vb arguments for now */ - if (MAN_Vb == tok) - continue; - if ( ! man_word_alloc(m, line, la, p)) return(0); } |