summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/mdoc.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2011-04-21 22:59:54 +0000
committerschwarze <schwarze@openbsd.org>2011-04-21 22:59:54 +0000
commit19a69263bb10fbb790f29529cf522bd27cc723ed (patch)
tree8b3fe3de29a79cc26872d99345cf7186a127033d /usr.bin/mandoc/mdoc.c
parentmatch on 6 series smbus, tested by Laurence Tratt (diff)
downloadwireguard-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/mdoc.c')
-rw-r--r--usr.bin/mandoc/mdoc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/mandoc/mdoc.c b/usr.bin/mandoc/mdoc.c
index 24c09e765a3..77e91ad23dc 100644
--- a/usr.bin/mandoc/mdoc.c
+++ b/usr.bin/mandoc/mdoc.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.81 2011/03/20 23:36:42 schwarze Exp $ */
+/* $Id: mdoc.c,v 1.82 2011/04/21 22:59:54 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -134,6 +134,8 @@ mdoc_free1(struct mdoc *mdoc)
free(mdoc->meta.vol);
if (mdoc->meta.msec)
free(mdoc->meta.msec);
+ if (mdoc->meta.date)
+ free(mdoc->meta.date);
}
@@ -297,7 +299,7 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
}
-int
+void
mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t,
int ln, int pos, const char *fmt, ...)
{
@@ -308,7 +310,7 @@ mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t,
vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
va_end(ap);
- return((*mdoc->msg)(t, mdoc->data, ln, pos, buf));
+ (*mdoc->msg)(t, mdoc->data, ln, pos, buf);
}