=================================================================== RCS file: /cvs/mandoc/mandoc_msg.c,v retrieving revision 1.1 retrieving revision 1.6 diff -u -p -r1.1 -r1.6 --- mandoc/mandoc_msg.c 2018/12/14 01:18:26 1.1 +++ mandoc/mandoc_msg.c 2019/03/06 15:55:38 1.6 @@ -1,4 +1,4 @@ -/* $OpenBSD: mandoc_msg.c,v 1.1 2018/12/14 01:18:26 schwarze Exp $ */ +/* $Id: mandoc_msg.c,v 1.6 2019/03/06 15:55:38 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze @@ -15,6 +15,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + #include #include #include @@ -167,6 +169,7 @@ static const char *const type_message[MANDOCERR_MAX] = "tab in filled text", "new sentence, new line", "invalid escape sequence", + "undefined escape, printing literally", "undefined string, using \"\"", /* related to tables */ @@ -228,6 +231,7 @@ static const char *const type_message[MANDOCERR_MAX] = "unsupported feature", "input too large", "unsupported control character", + "unsupported escape sequence", "unsupported roff request", "nested .while loops", "end of scope with open .while loop", @@ -238,7 +242,7 @@ static const char *const type_message[MANDOCERR_MAX] = "ignoring macro in table", }; -static FILE *fileptr = stderr; +static FILE *fileptr = NULL; static const char *filename = NULL; static enum mandocerr min_type = MANDOCERR_MAX; static enum mandoclevel rc = MANDOCLEVEL_OK; @@ -288,8 +292,7 @@ mandoc_msg_setrc(enum mandoclevel level) } void -mandoc_vmsg(enum mandocerr t, void *dummy, int line, int col, - const char *fmt, ...) +mandoc_msg(enum mandocerr t, int line, int col, const char *fmt, ...) { va_list ap; enum mandoclevel level; @@ -323,13 +326,4 @@ mandoc_vmsg(enum mandocerr t, void *dummy, int line, i va_end(ap); } fputc('\n', fileptr); -} - -void -mandoc_msg(enum mandocerr t, void *dummy, int line, int col, const char *msg) -{ - if (msg == NULL) - mandoc_vmsg(t, dummy, line, col, NULL); - else - mandoc_vmsg(t, dummy, line, col, "%s", msg); }