aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_argv.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-07-06 19:09:00 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-07-06 19:09:00 +0000
commit279088dca61ff8b3eba9213224848a2d47e6c941 (patch)
treea87f0c1c20db3bc71eb955c9e4d499df687aa6fe /mdoc_argv.c
parentb1be2297051d05342ce460b198946cf9a4b42c44 (diff)
downloadmandoc-279088dca61ff8b3eba9213224848a2d47e6c941.tar.gz
mandoc-279088dca61ff8b3eba9213224848a2d47e6c941.tar.zst
mandoc-279088dca61ff8b3eba9213224848a2d47e6c941.zip
Clean up messages related to plain text and to escape sequences.
* Mention invalid escape sequences and string names, and fallbacks. * Hierarchical naming.
Diffstat (limited to 'mdoc_argv.c')
-rw-r--r--mdoc_argv.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/mdoc_argv.c b/mdoc_argv.c
index cd5ab1f2..e48516cd 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_argv.c,v 1.94 2014/07/02 03:48:07 schwarze Exp $ */
+/* $Id: mdoc_argv.c,v 1.95 2014/07/06 19:09:00 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -461,7 +461,8 @@ args(struct mdoc *mdoc, int line, int *pos,
* is unterminated.
*/
if (MDOC_PHRASELIT & mdoc->flags)
- mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE);
+ mandoc_msg(MANDOCERR_ARG_QUOTE,
+ mdoc->parse, line, *pos, NULL);
mdoc->flags &= ~MDOC_PHRASELIT;
return(ARGS_EOLN);
@@ -520,7 +521,8 @@ args(struct mdoc *mdoc, int line, int *pos,
/* Whitespace check for eoln case... */
if ('\0' == *p && ' ' == *(p - 1))
- mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE);
+ mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+ line, *pos, NULL);
*pos += (int)(p - *v);
@@ -575,7 +577,8 @@ args(struct mdoc *mdoc, int line, int *pos,
if ('\0' == buf[*pos]) {
if (MDOC_PPHRASE & mdoc->flags)
return(ARGS_QWORD);
- mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE);
+ mandoc_msg(MANDOCERR_ARG_QUOTE,
+ mdoc->parse, line, *pos, NULL);
return(ARGS_QWORD);
}
@@ -589,7 +592,8 @@ args(struct mdoc *mdoc, int line, int *pos,
(*pos)++;
if ('\0' == buf[*pos])
- mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE);
+ mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+ line, *pos, NULL);
return(ARGS_QWORD);
}