=================================================================== RCS file: /cvs/mandoc/tbl_data.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- mandoc/tbl_data.c 2015/01/27 05:21:45 1.34 +++ mandoc/tbl_data.c 2015/01/28 15:03:45 1.35 @@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.34 2015/01/27 05:21:45 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.35 2015/01/28 15:03:45 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2015 Ingo Schwarze @@ -138,14 +138,11 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, } int -tbl_cdata(struct tbl_node *tbl, int ln, const char *p) +tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_dat *dat; size_t sz; - int pos; - pos = 0; - dat = tbl->last_span->last; if (p[pos] == 'T' && p[pos + 1] == '}') { @@ -204,11 +201,10 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row } void -tbl_data(struct tbl_node *tbl, int ln, const char *p) +tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_span *dp; struct tbl_row *rp; - int pos; /* * Choose a layout row: take the one following the last parsed @@ -259,7 +255,6 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) dp->pos = TBL_SPAN_DATA; - pos = 0; while ('\0' != p[pos]) getdata(tbl, dp, ln, p, &pos); }