From 1e7939918df65f9471cdc0622fe36a0ff3a6ebc9 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Sun, 5 Jan 2014 18:37:53 +0000 Subject: Merge NetBSD's r1.4: Rename data to getdata to work around bugs in the PPC64 toolchain. --- tbl_data.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tbl_data.c') diff --git a/tbl_data.c b/tbl_data.c index 7413aa2d..9c56002f 100644 --- a/tbl_data.c +++ b/tbl_data.c @@ -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); -- cgit v1.2.3