=================================================================== RCS file: /cvs/mandoc/tbl_data.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- mandoc/tbl_data.c 2013/06/01 04:56:50 1.27 +++ mandoc/tbl_data.c 2014/01/05 18:37:53 1.28 @@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.27 2013/06/01 04:56:50 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.28 2014/01/05 18:37:53 joerg Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -29,13 +29,13 @@ #include "libmandoc.h" #include "libroff.h" -static int data(struct tbl_node *, struct tbl_span *, +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 -data(struct tbl_node *tbl, struct tbl_span *dp, +getdata(struct tbl_node *tbl, struct tbl_span *dp, int ln, const char *p, int *pos) { struct tbl_dat *dat; @@ -152,7 +152,7 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p) if (p[pos] == tbl->opts.tab) { tbl->part = TBL_PART_DATA; pos++; - return(data(tbl, tbl->last_span, ln, p, &pos)); + return(getdata(tbl, tbl->last_span, ln, p, &pos)); } else if ('\0' == p[pos]) { tbl->part = TBL_PART_DATA; return(1); @@ -267,7 +267,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) /* This returns 0 when TBL_PART_CDATA is entered. */ while ('\0' != p[pos]) - if ( ! data(tbl, dp, ln, p, &pos)) + if ( ! getdata(tbl, dp, ln, p, &pos)) return(0); return(1);