In .Bl -column, if some of the column width declarations are given

[mandoc.git] / eqn.c

diff --git a/eqn.c b/eqn.c
index 015d9eec83cf81cc5c9b69e8c80d938b9422b8be..cda0db5d26e457eedb92dd5e504b288c4e060e70 100644 (file)
--- a/eqn.c
+++ b/eqn.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn.c,v 1.40 2014/04/20 16:46:04 schwarze Exp $ */
+/*     $Id: eqn.c,v 1.44 2014/07/06 19:09:00 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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;
                }