diff options
author | 2011-04-21 22:59:54 +0000 | |
---|---|---|
committer | 2011-04-21 22:59:54 +0000 | |
commit | 19a69263bb10fbb790f29529cf522bd27cc723ed (patch) | |
tree | 8b3fe3de29a79cc26872d99345cf7186a127033d /usr.bin/mandoc/man.c | |
parent | match on 6 series smbus, tested by Laurence Tratt (diff) | |
download | wireguard-openbsd-19a69263bb10fbb790f29529cf522bd27cc723ed.tar.xz wireguard-openbsd-19a69263bb10fbb790f29529cf522bd27cc723ed.zip |
Merge version 1.10.10:
lots of cleanup and maintenance work by kristaps@.
- move some main.c globals into struct curparse
- move mandoc_*alloc to mandoc.h such that all code can use them
- make mandoc_isdelim available to formatting frontends
- dissolve mdoc_strings.c, move the code where it is used
- make all error reporting functions void, their return values were useless
- and various minor cleanups and fixes
Diffstat (limited to 'usr.bin/mandoc/man.c')
-rw-r--r-- | usr.bin/mandoc/man.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c index 29d879b1563..b7c14eb7a15 100644 --- a/usr.bin/mandoc/man.c +++ b/usr.bin/mandoc/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.57 2011/03/20 23:36:42 schwarze Exp $ */ +/* $Id: man.c,v 1.58 2011/04/21 22:59:54 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -618,7 +618,7 @@ err: /* Error out. */ } -int +void man_vmsg(struct man *man, enum mandocerr t, int ln, int pos, const char *fmt, ...) { @@ -628,7 +628,7 @@ man_vmsg(struct man *man, enum mandocerr t, va_start(ap, fmt); vsnprintf(buf, sizeof(buf) - 1, fmt, ap); va_end(ap); - return((*man->msg)(t, man->data, ln, pos, buf)); + (*man->msg)(t, man->data, ln, pos, buf); } |