===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.28
retrieving revision 1.33
diff -u -p -r1.28 -r1.33
--- mandoc/tbl_data.c	2014/01/05 18:37:53	1.28
+++ mandoc/tbl_data.c	2015/01/21 00:47:04	1.33
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.28 2014/01/05 18:37:53 joerg Exp $ */
+/*	$Id: tbl_data.c,v 1.33 2015/01/21 00:47:04 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,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 <ctype.h>
 #include <stdlib.h>
@@ -26,16 +26,18 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	int		 getdata(struct tbl_node *, struct tbl_span *, 
+static	void		 getdata(struct tbl_node *, struct tbl_span *,
 				int, const char *, int *);
-static	struct tbl_span	*newspan(struct tbl_node *, int, 
+static	struct tbl_span	*newspan(struct tbl_node *, int,
 				struct tbl_row *);
 
-static int
-getdata(struct tbl_node *tbl, struct tbl_span *dp, 
+
+static void
+getdata(struct tbl_node *tbl, struct tbl_span *dp,
 		int ln, const char *p, int *pos)
 {
 	struct tbl_dat	*dat;
@@ -48,7 +50,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, 
 	else if (NULL == dp->last)
 		cp = dp->layout->first;
 
-	/* 
+	/*
 	 * Skip over spanners, since
 	 * we want to match data with data layout cells in the header.
 	 */
@@ -62,12 +64,12 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, 
 	 */
 
 	if (NULL == cp) {
-		mandoc_msg(MANDOCERR_TBLEXTRADAT, 
-				tbl->parse, ln, *pos, NULL);
+		mandoc_msg(MANDOCERR_TBLEXTRADAT, tbl->parse,
+		    ln, *pos, NULL);
 		/* Skip to the end... */
 		while (p[*pos])
 			(*pos)++;
-		return(1);
+		return;
 	}
 
 	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
@@ -81,7 +83,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, 
 			spans++;
 		else
 			break;
-	
+
 	dat->spans = spans;
 
 	if (dp->last) {
@@ -102,7 +104,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, 
 
 	if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
 		tbl->part = TBL_PART_CDATA;
-		return(1);
+		return;
 	}
 
 	assert(*pos - sv >= 0);
@@ -126,21 +128,20 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, 
 		dat->pos = TBL_DATA_DATA;
 
 	if (TBL_CELL_HORIZ == dat->layout->pos ||
-			TBL_CELL_DHORIZ == dat->layout->pos ||
-			TBL_CELL_DOWN == dat->layout->pos)
+	    TBL_CELL_DHORIZ == dat->layout->pos ||
+	    TBL_CELL_DOWN == dat->layout->pos)
 		if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
-			mandoc_msg(MANDOCERR_TBLIGNDATA, 
-					tbl->parse, ln, sv, NULL);
+			mandoc_msg(MANDOCERR_TBLIGNDATA,
+			    tbl->parse, ln, sv, NULL);
 
-	return(1);
+	return;
 }
 
-/* ARGSUSED */
 int
 tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 {
 	struct tbl_dat	*dat;
-	size_t	 	 sz;
+	size_t		 sz;
 	int		 pos;
 
 	pos = 0;
@@ -152,7 +153,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 		if (p[pos] == tbl->opts.tab) {
 			tbl->part = TBL_PART_DATA;
 			pos++;
-			return(getdata(tbl, tbl->last_span, ln, p, &pos));
+			getdata(tbl, tbl->last_span, ln, p, &pos);
+			return(1);
 		} else if ('\0' == p[pos]) {
 			tbl->part = TBL_PART_DATA;
 			return(1);
@@ -166,14 +168,14 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 	if (dat->string) {
 		sz = strlen(p) + strlen(dat->string) + 2;
 		dat->string = mandoc_realloc(dat->string, sz);
-		strlcat(dat->string, " ", sz);
-		strlcat(dat->string, p, sz);
+		(void)strlcat(dat->string, " ", sz);
+		(void)strlcat(dat->string, p, sz);
 	} else
 		dat->string = mandoc_strdup(p);
 
-	if (TBL_CELL_DOWN == dat->layout->pos) 
-		mandoc_msg(MANDOCERR_TBLIGNDATA, 
-				tbl->parse, ln, pos, NULL);
+	if (TBL_CELL_DOWN == dat->layout->pos)
+		mandoc_msg(MANDOCERR_TBLIGNDATA, tbl->parse,
+		    ln, pos, NULL);
 
 	return(0);
 }
@@ -201,21 +203,14 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row
 	return(dp);
 }
 
-int
+void
 tbl_data(struct tbl_node *tbl, int ln, const char *p)
 {
 	struct tbl_span	*dp;
 	struct tbl_row	*rp;
 	int		 pos;
 
-	pos = 0;
-
-	if ('\0' == p[pos]) {
-		mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL);
-		return(0);
-	}
-
-	/* 
+	/*
 	 * Choose a layout row: take the one following the last parsed
 	 * span's.  If that doesn't exist, use the last parsed span's.
 	 * If there's no last parsed span, use the first row.  Lastly,
@@ -229,11 +224,11 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 			for (rp = tbl->last_span->layout->next;
 					rp && rp->first; rp = rp->next) {
 				switch (rp->first->pos) {
-				case (TBL_CELL_HORIZ):
+				case TBL_CELL_HORIZ:
 					dp = newspan(tbl, ln, rp);
 					dp->pos = TBL_SPAN_HORIZ;
 					continue;
-				case (TBL_CELL_DHORIZ):
+				case TBL_CELL_DHORIZ:
 					dp = newspan(tbl, ln, rp);
 					dp->pos = TBL_SPAN_DHORIZ;
 					continue;
@@ -256,19 +251,15 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 
 	if ( ! strcmp(p, "_")) {
 		dp->pos = TBL_SPAN_HORIZ;
-		return(1);
+		return;
 	} else if ( ! strcmp(p, "=")) {
 		dp->pos = TBL_SPAN_DHORIZ;
-		return(1);
+		return;
 	}
 
 	dp->pos = TBL_SPAN_DATA;
 
-	/* This returns 0 when TBL_PART_CDATA is entered. */
-
+	pos = 0;
 	while ('\0' != p[pos])
-		if ( ! getdata(tbl, dp, ln, p, &pos))
-			return(0);
-
-	return(1);
+		getdata(tbl, dp, ln, p, &pos);
 }