summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-07-07 09:52:08 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-07-07 09:52:08 +0000
commit46333ce833349b3542096c725c78ada3ca4b2811 (patch)
treed0a814a8fa07ddca21b24dedd532cfd8c87aa866
parent4b6281d011b796bb8e659d02bba89300b58df31b (diff)
downloadmandoc-46333ce833349b3542096c725c78ada3ca4b2811.tar.gz
Small clean-ups in error message usage.VERSION.1.7.23
Version.
-rw-r--r--Makefile4
-rw-r--r--main.c2
-rw-r--r--mdoc_validate.c6
3 files changed, 5 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 839a805e..d60c0f37 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ INSTALL_DATA = install -m 0444
INSTALL_LIB = install -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-VERSION = 1.7.22
-VDATE = 5 July 2009
+VERSION = 1.7.23
+VDATE = 7 July 2009
VFLAGS = -DVERSION=\"$(VERSION)\"
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
diff --git a/main.c b/main.c
index 74690e47..6a7a38d4 100644
--- a/main.c
+++ b/main.c
@@ -643,7 +643,7 @@ mwarn(void *arg, int line, int col, const char *msg)
if ( ! (curp->wflags & WARN_WALL))
return(1);
- warnx("%s:%d: syntax warning: %s (column %d)",
+ warnx("%s:%d: warning: %s (column %d)",
curp->file, line, msg, col);
if ( ! (curp->wflags & WARN_WERR))
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 8541c8e2..fe8ac1be 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -853,14 +853,12 @@ post_bf(POST_ARGS)
head = mdoc->last->head;
if (mdoc->last->args && head->child)
- return(mdoc_verr(mdoc, mdoc->last->line,
- mdoc->last->pos, "one argument expected"));
+ return(mdoc_nerr(mdoc, mdoc->last, ELINE));
else if (mdoc->last->args)
return(1);
if (NULL == head->child || MDOC_TEXT != head->child->type)
- return(mdoc_verr(mdoc, mdoc->last->line,
- mdoc->last->pos, "text argument expected"));
+ return(mdoc_nerr(mdoc, mdoc->last, ELINE));
p = head->child->string;