===================================================================
RCS file: /cvs/mandoc/eqn.c,v
retrieving revision 1.40
retrieving revision 1.45
diff -u -p -r1.40 -r1.45
--- mandoc/eqn.c	2014/04/20 16:46:04	1.40
+++ mandoc/eqn.c	2014/08/10 23:54:41	1.45
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.40 2014/04/20 16:46:04 schwarze Exp $ */
+/*	$Id: eqn.c,v 1.45 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,10 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
+
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
@@ -300,7 +300,8 @@ eqn_read(struct eqn_node **epp, int ln,
 			p++;
 		if ('\0' == *p)
 			return(er);
-		mandoc_msg(MANDOCERR_ARGSLOST, ep->parse, ln, pos, NULL);
+		mandoc_vmsg(MANDOCERR_ARG_SKIP, ep->parse,
+		    ln, pos, "EN %s", p);
 		return(er);
 	}
 
@@ -628,7 +629,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 	for (i = 0; i < (int)EQNSYM__MAX; i++)
 		if (EQNSTREQ(&eqnsyms[i].str, start, sz)) {
 			sym[63] = '\0';
-			snprintf(sym, 62, "\\[%s]", eqnsyms[i].sym);
+			(void)snprintf(sym, 62, "\\[%s]", eqnsyms[i].sym);
 			bp->text = mandoc_strdup(sym);
 			return(EQN_OK);
 		}
@@ -767,7 +768,7 @@ again:
 			ep->cur++;
 	} else {
 		if (q)
-			EQN_MSG(MANDOCERR_BADQUOTE, ep);
+			EQN_MSG(MANDOCERR_ARG_QUOTE, ep);
 		next = strchr(start, '\0');
 		*sz = (size_t)(next - start);
 		ep->cur += *sz;
@@ -864,8 +865,8 @@ eqn_do_define(struct eqn_node *ep)
 
 		if (i == (int)ep->defsz) {
 			ep->defsz++;
-			ep->defs = mandoc_realloc(ep->defs,
-			    ep->defsz * sizeof(struct eqn_def));
+			ep->defs = mandoc_reallocarray(ep->defs,
+			    ep->defsz, sizeof(struct eqn_def));
 			ep->defs[i].key = ep->defs[i].val = NULL;
 		}