===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- mandoc/tbl_data.c	2011/02/06 22:02:58	1.22
+++ mandoc/tbl_data.c	2013/05/31 21:37:17	1.26
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.22 2011/02/06 22:02:58 kristaps Exp $ */
+/*	$Id: tbl_data.c,v 1.26 2013/05/31 21:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,13 +49,11 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 		cp = dp->layout->first;
 
 	/* 
-	 * Skip over spanners and vertical lines to data formats, since
+	 * Skip over spanners, since
 	 * we want to match data with data layout cells in the header.
 	 */
 
-	while (cp && (TBL_CELL_VERT == cp->pos || 
-				TBL_CELL_DVERT == cp->pos ||
-				TBL_CELL_SPAN == cp->pos))
+	while (cp && TBL_CELL_SPAN == cp->pos)
 		cp = cp->next;
 
 	/*
@@ -64,7 +62,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 	 */
 
 	if (NULL == cp) {
-		TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+		mandoc_msg(MANDOCERR_TBLEXTRADAT, 
+				tbl->parse, ln, *pos, NULL);
 		/* Skip to the end... */
 		while (p[*pos])
 			(*pos)++;
@@ -106,8 +105,10 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 		return(0);
 	}
 
-	dat->string = mandoc_malloc(*pos - sv + 1);
-	memcpy(dat->string, &p[sv], *pos - sv);
+	assert(*pos - sv >= 0);
+
+	dat->string = mandoc_malloc((size_t)(*pos - sv + 1));
+	memcpy(dat->string, &p[sv], (size_t)(*pos - sv));
 	dat->string[*pos - sv] = '\0';
 
 	if (p[*pos])
@@ -128,7 +129,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 			TBL_CELL_DHORIZ == dat->layout->pos ||
 			TBL_CELL_DOWN == dat->layout->pos)
 		if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
-			TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv);
+			mandoc_msg(MANDOCERR_TBLIGNDATA, 
+					tbl->parse, ln, sv, NULL);
 
 	return(1);
 }
@@ -170,7 +172,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 		dat->string = mandoc_strdup(p);
 
 	if (TBL_CELL_DOWN == dat->layout->pos) 
-		TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos);
+		mandoc_msg(MANDOCERR_TBLIGNDATA, 
+				tbl->parse, ln, pos, NULL);
 
 	return(0);
 }
@@ -182,7 +185,7 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row
 
 	dp = mandoc_calloc(1, sizeof(struct tbl_span));
 	dp->line = line;
-	dp->tbl = &tbl->opts;
+	dp->opts = &tbl->opts;
 	dp->layout = rp;
 	dp->head = tbl->first_head;
 
@@ -208,7 +211,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 	pos = 0;
 
 	if ('\0' == p[pos]) {
-		TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
+		mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL);
 		return(0);
 	}