diff options
Diffstat (limited to 'tbl_opts.c')
| -rw-r--r-- | tbl_opts.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -81,7 +81,7 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key) switch (key) { case KEY_DELIM: - mandoc_vmsg(MANDOCERR_TBLOPT_EQN, tbl->parse, + mandoc_msg(MANDOCERR_TBLOPT_EQN, ln, *pos, "%.*s", len, p + *pos); want = 2; break; @@ -103,12 +103,11 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key) } if (len == 0) - mandoc_msg(MANDOCERR_TBLOPT_NOARG, - tbl->parse, ln, *pos, keys[key].name); + mandoc_msg(MANDOCERR_TBLOPT_NOARG, ln, *pos, + "%s", keys[key].name); else if (want && len != want) - mandoc_vmsg(MANDOCERR_TBLOPT_ARGSZ, - tbl->parse, ln, *pos, "%s want %d have %d", - keys[key].name, want, len); + mandoc_msg(MANDOCERR_TBLOPT_ARGSZ, ln, *pos, + "%s want %d have %d", keys[key].name, want, len); *pos += len; if (p[*pos] == ')') @@ -142,8 +141,8 @@ tbl_option(struct tbl_node *tbl, int ln, const char *p, int *offs) len++; if (len == 0) { - mandoc_vmsg(MANDOCERR_TBLOPT_ALPHA, - tbl->parse, ln, pos, "%c", p[pos]); + mandoc_msg(MANDOCERR_TBLOPT_ALPHA, + ln, pos, "%c", p[pos]); pos++; continue; } @@ -157,7 +156,7 @@ tbl_option(struct tbl_node *tbl, int ln, const char *p, int *offs) i++; if (i == KEY_MAXKEYS) { - mandoc_vmsg(MANDOCERR_TBLOPT_BAD, tbl->parse, + mandoc_msg(MANDOCERR_TBLOPT_BAD, ln, pos, "%.*s", len, p + pos); pos += len; continue; |