===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_data.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/mandoc/tbl_data.c	2014/11/28 19:25:03	1.19
--- src/usr.bin/mandoc/tbl_data.c	2015/01/21 00:45:16	1.20
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_data.c,v 1.19 2014/11/28 19:25:03 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_data.c,v 1.20 2015/01/21 00:45:16 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 28,40 ****
  #include "libmandoc.h"
  #include "libroff.h"
  
! static	int		 getdata(struct tbl_node *, struct tbl_span *,
  				int, const char *, int *);
  static	struct tbl_span	*newspan(struct tbl_node *, int,
  				struct tbl_row *);
  
  
! static int
  getdata(struct tbl_node *tbl, struct tbl_span *dp,
  		int ln, const char *p, int *pos)
  {
--- 28,40 ----
  #include "libmandoc.h"
  #include "libroff.h"
  
! static	void		 getdata(struct tbl_node *, struct tbl_span *,
  				int, const char *, int *);
  static	struct tbl_span	*newspan(struct tbl_node *, int,
  				struct tbl_row *);
  
  
! static void
  getdata(struct tbl_node *tbl, struct tbl_span *dp,
  		int ln, const char *p, int *pos)
  {
***************
*** 67,73 ****
  		/* Skip to the end... */
  		while (p[*pos])
  			(*pos)++;
! 		return(1);
  	}
  
  	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
--- 67,73 ----
  		/* Skip to the end... */
  		while (p[*pos])
  			(*pos)++;
! 		return;
  	}
  
  	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
***************
*** 102,108 ****
  
  	if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
  		tbl->part = TBL_PART_CDATA;
! 		return(1);
  	}
  
  	assert(*pos - sv >= 0);
--- 102,108 ----
  
  	if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
  		tbl->part = TBL_PART_CDATA;
! 		return;
  	}
  
  	assert(*pos - sv >= 0);
***************
*** 132,138 ****
  			mandoc_msg(MANDOCERR_TBLIGNDATA,
  			    tbl->parse, ln, sv, NULL);
  
! 	return(1);
  }
  
  int
--- 132,138 ----
  			mandoc_msg(MANDOCERR_TBLIGNDATA,
  			    tbl->parse, ln, sv, NULL);
  
! 	return;
  }
  
  int
***************
*** 151,157 ****
  		if (p[pos] == tbl->opts.tab) {
  			tbl->part = TBL_PART_DATA;
  			pos++;
! 			return(getdata(tbl, tbl->last_span, ln, p, &pos));
  		} else if ('\0' == p[pos]) {
  			tbl->part = TBL_PART_DATA;
  			return(1);
--- 151,158 ----
  		if (p[pos] == tbl->opts.tab) {
  			tbl->part = TBL_PART_DATA;
  			pos++;
! 			getdata(tbl, tbl->last_span, ln, p, &pos);
! 			return(1);
  		} else if ('\0' == p[pos]) {
  			tbl->part = TBL_PART_DATA;
  			return(1);
***************
*** 200,219 ****
  	return(dp);
  }
  
! int
  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.
--- 201,213 ----
  	return(dp);
  }
  
! void
  tbl_data(struct tbl_node *tbl, int ln, const char *p)
  {
  	struct tbl_span	*dp;
  	struct tbl_row	*rp;
  	int		 pos;
  
  	/*
  	 * Choose a layout row: take the one following the last parsed
  	 * span's.  If that doesn't exist, use the last parsed span's.
***************
*** 255,273 ****
  
  	if ( ! strcmp(p, "_")) {
  		dp->pos = TBL_SPAN_HORIZ;
! 		return(1);
  	} else if ( ! strcmp(p, "=")) {
  		dp->pos = TBL_SPAN_DHORIZ;
! 		return(1);
  	}
  
  	dp->pos = TBL_SPAN_DATA;
  
! 	/* This returns 0 when TBL_PART_CDATA is entered. */
! 
  	while ('\0' != p[pos])
! 		if ( ! getdata(tbl, dp, ln, p, &pos))
! 			return(0);
! 
! 	return(1);
  }
--- 249,263 ----
  
  	if ( ! strcmp(p, "_")) {
  		dp->pos = TBL_SPAN_HORIZ;
! 		return;
  	} else if ( ! strcmp(p, "=")) {
  		dp->pos = TBL_SPAN_DHORIZ;
! 		return;
  	}
  
  	dp->pos = TBL_SPAN_DATA;
  
! 	pos = 0;
  	while ('\0' != p[pos])
! 		getdata(tbl, dp, ln, p, &pos);
  }