aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/man.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 /man.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 'man.c')
-rw-r--r--man.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/man.c b/man.c
index ac69d176..9f671a66 100644
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.130 2014/05/07 14:14:17 schwarze Exp $ */
+/* $Id: man.c,v 1.131 2014/07/06 19:09:00 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -447,7 +447,8 @@ man_ptext(struct man *man, int line, char *buf, int offs)
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
if (i > 1 && '\\' != buf[i - 2])
- man_pmsg(man, line, i - 1, MANDOCERR_EOLNSPACE);
+ mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+ line, i - 1, NULL);
for (--i; i && ' ' == buf[i]; i--)
/* Spin back to non-space. */ ;
@@ -483,7 +484,8 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
struct man_node *n;
if ('"' == buf[offs]) {
- man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT);
+ mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
+ ln, offs, NULL);
return(1);
} else if ('\0' == buf[offs])
return(1);
@@ -521,7 +523,8 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
*/
if ('\0' == buf[offs] && ' ' == buf[offs - 1])
- man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE);
+ mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+ ln, offs - 1, NULL);
/*
* Remove prior ELINE macro, as it's being clobbered by a new