summaryrefslogtreecommitdiffstatshomepage
path: root/man_macro.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-06-18 10:53:58 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-06-18 10:53:58 +0000
commit52078b04137667fec0f8506ad5417fffefd8f82d (patch)
tree206c99ff4874368c5c3874ffe02f5bee49456266 /man_macro.c
parente100896ec287b69a49978cc7502276f0759544b0 (diff)
downloadmandoc-52078b04137667fec0f8506ad5417fffefd8f82d.tar.gz
mandoc-52078b04137667fec0f8506ad5417fffefd8f82d.tar.zst
mandoc-52078b04137667fec0f8506ad5417fffefd8f82d.zip
Moved all formatted libman warn/error into man.c/libman.h.
Converted all formatted warn/errors into regular syntax.
Diffstat (limited to 'man_macro.c')
-rw-r--r--man_macro.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/man_macro.c b/man_macro.c
index e619f452..e63657e1 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.16 2009/06/16 19:55:28 kristaps Exp $ */
+/* $Id: man_macro.c,v 1.17 2009/06/18 10:53:58 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -82,16 +82,14 @@ man_macro(struct man *man, int tok, int line,
if (n == man->last && (FL_NLINE & man_flags[tok])) {
if (MAN_NLINE & man->flags)
- return(man_verr(man, line, ppos,
- "next-line scope already open"));
+ return(man_perr(man, line, ppos, WLNSCOPE));
man->flags |= MAN_NLINE;
return(1);
}
if (FL_TLINE & man_flags[tok]) {
if (MAN_NLINE & man->flags)
- return(man_verr(man, line, ppos,
- "next-line scope already open"));
+ return(man_perr(man, line, ppos, WLNSCOPE));
man->flags |= MAN_NLINE;
return(1);
}
@@ -186,7 +184,7 @@ man_args(struct man *m, int line,
if (buf[*pos])
return(1);
- if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+ if ( ! man_pwarn(m, line, *pos, WTSPACE))
return(-1);
return(1);
@@ -204,7 +202,7 @@ man_args(struct man *m, int line,
(*pos)++;
if (0 == buf[*pos]) {
- if ( ! man_vwarn(m, line, *pos, "unterminated quote"))
+ if ( ! man_pwarn(m, line, *pos, WTQUOTE))
return(-1);
return(1);
}
@@ -219,7 +217,7 @@ man_args(struct man *m, int line,
if (buf[*pos])
return(1);
- if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+ if ( ! man_pwarn(m, line, *pos, WTSPACE))
return(-1);
return(1);
}