From 9a6a4eb84af13ded9474fbe8c1363fb2482a3492 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Mon, 27 Jul 2009 19:43:02 +0000 Subject: main.c using fprintf instead of warnx for parse errors (like cc). Error string is now file:line:col: message. Removed sed from vim -q example in manuals.7. Fixed column reporting (off by one). --- main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index a7b5c4d4..d2d5a869 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.39 2009/07/24 14:00:59 kristaps Exp $ */ +/* $Id: main.c,v 1.40 2009/07/27 19:43:02 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -418,7 +418,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) /* NOTE a parser may not have been assigned, yet. */ if ( ! (man || mdoc)) { - warnx("%s: not a manual", curp->file); + (void)fprintf(stderr, "%s: not a manual", curp->file); return(0); } @@ -639,8 +639,8 @@ merr(void *arg, int line, int col, const char *msg) curp = (struct curparse *)arg; - warnx("%s:%d: error: %s (column %d)", - curp->file, line, msg, col); + (void)fprintf(stderr, "%s:%d:%d: error: %s\n", + curp->file, line, col + 1, msg); return(0); } @@ -656,13 +656,12 @@ mwarn(void *arg, int line, int col, const char *msg) if ( ! (curp->wflags & WARN_WALL)) return(1); - warnx("%s:%d: warning: %s (column %d)", - curp->file, line, msg, col); + (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", + curp->file, line, col + 1, msg); if ( ! (curp->wflags & WARN_WERR)) return(1); - warnx("considering warnings as errors"); return(0); } -- cgit v1.2.3-56-ge451