===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_data.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/mandoc/tbl_data.c	2013/06/01 04:56:41	1.14
--- src/usr.bin/mandoc/tbl_data.c	2014/01/05 21:02:43	1.15
***************
*** 1,4 ****
! /*	$Id: tbl_data.c,v 1.14 2013/06/01 04:56:41 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: tbl_data.c,v 1.15 2014/01/05 21:02:43 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 25,37 ****
  #include "libmandoc.h"
  #include "libroff.h"
  
! static	int		 data(struct tbl_node *, struct tbl_span *, 
  				int, const char *, int *);
  static	struct tbl_span	*newspan(struct tbl_node *, int, 
  				struct tbl_row *);
  
  static int
! data(struct tbl_node *tbl, struct tbl_span *dp, 
  		int ln, const char *p, int *pos)
  {
  	struct tbl_dat	*dat;
--- 25,37 ----
  #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)
  {
  	struct tbl_dat	*dat;
***************
*** 148,154 ****
  		if (p[pos] == tbl->opts.tab) {
  			tbl->part = TBL_PART_DATA;
  			pos++;
! 			return(data(tbl, tbl->last_span, ln, p, &pos));
  		} else if ('\0' == p[pos]) {
  			tbl->part = TBL_PART_DATA;
  			return(1);
--- 148,154 ----
  		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);
***************
*** 263,269 ****
  	/* This returns 0 when TBL_PART_CDATA is entered. */
  
  	while ('\0' != p[pos])
! 		if ( ! data(tbl, dp, ln, p, &pos))
  			return(0);
  
  	return(1);
--- 263,269 ----
  	/* This returns 0 when TBL_PART_CDATA is entered. */
  
  	while ('\0' != p[pos])
! 		if ( ! getdata(tbl, dp, ln, p, &pos))
  			return(0);
  
  	return(1);