summaryrefslogtreecommitdiffstatshomepage
path: root/action.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-01-16 11:50:54 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-01-16 11:50:54 +0000
commita1a867fb1c1e2901c238afa76abb2f2168efca20 (patch)
treeb52a416509f19219775a93c70d0926ff15fd0cef /action.c
parentd3f9cacf68a35ab54ef8d339821e76db6ba69e73 (diff)
downloadmandoc-a1a867fb1c1e2901c238afa76abb2f2168efca20.tar.gz
mandoc-a1a867fb1c1e2901c238afa76abb2f2168efca20.tar.zst
mandoc-a1a867fb1c1e2901c238afa76abb2f2168efca20.zip
Finished re-fitting err/warn/msg routines.
Some minor bug-fixes.
Diffstat (limited to 'action.c')
-rw-r--r--action.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/action.c b/action.c
index 7f09a571..3c0981e9 100644
--- a/action.c
+++ b/action.c
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.7 2009/01/12 12:52:21 kristaps Exp $ */
+/* $Id: action.c,v 1.8 2009/01/16 11:50:54 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -203,12 +203,12 @@ post_dt(struct mdoc *mdoc)
case (0):
if (xstrlcpy(mdoc->meta.title, p, sz))
break;
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual title parameter"));
case (1):
mdoc->meta.msec = mdoc_atomsec(p);
if (MSEC_DEFAULT != mdoc->meta.msec)
break;
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual section parameter"));
case (2):
mdoc->meta.vol = mdoc_atovol(p);
if (VOL_DEFAULT != mdoc->meta.vol)
@@ -216,9 +216,9 @@ post_dt(struct mdoc *mdoc)
mdoc->meta.arch = mdoc_atoarch(p);
if (ARCH_DEFAULT != mdoc->meta.arch)
break;
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual volume parameter"));
default:
- return(mdoc_err(mdoc, ERR_ARGS_MANY));
+ return(mdoc_nerr(mdoc, n, "too many parameters"));
}
}
@@ -246,9 +246,9 @@ post_os(struct mdoc *mdoc)
p = n->data.text.string;
if ( ! xstrlcat(mdoc->meta.os, p, sz))
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual system parameter"));
if ( ! xstrlcat(mdoc->meta.os, " ", sz))
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual system parameter"));
}
if (0 == mdoc->meta.os[0])
@@ -281,7 +281,7 @@ post_dd(struct mdoc *mdoc)
assert(MDOC_TEXT == n->type);
p = n->data.text.string;
- if (xstrcmp(p, "$Mdocdate: January 12 2009 $")) {
+ if (xstrcmp(p, "$Mdocdate: January 16 2009 $")) {
mdoc->meta.date = time(NULL);
continue;
} else if (xstrcmp(p, "$")) {
@@ -291,9 +291,9 @@ post_dd(struct mdoc *mdoc)
continue;
if ( ! xstrlcat(date, n->data.text.string, sz))
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual date parameter"));
if ( ! xstrlcat(date, " ", sz))
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_nerr(mdoc, n, "badly-formed manual date parameter"));
}
if (mdoc->meta.date && NULL == n) {
@@ -302,7 +302,7 @@ post_dd(struct mdoc *mdoc)
return(1);
}
- return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+ return(mdoc_err(mdoc, "badly-formed manual date"));
}