From: schwarze <schwarze@openbsd.org>
Date: Sun, 5 Jan 2014 21:02:43 +0000 (+0000)
Subject: Merge NetBSD rev. 1.4:
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6ff6a9aa199fb5b1209e47ed8e61e1e3522b7ddd;p=openbsd

Merge NetBSD rev. 1.4:
Rename static function data() to getdata()
to work around bugs in the NetBSD PPC64 toolchain.
Original author of the patch: Christos Zoulas <christos@NetBSD>.
Received via Joerg Sonnenberger <joerg@NetBSD>.
---

diff --git a/usr.bin/mandoc/tbl_data.c b/usr.bin/mandoc/tbl_data.c
index d4c59301a83..65327595286 100644
--- a/usr.bin/mandoc/tbl_data.c
+++ b/usr.bin/mandoc/tbl_data.c
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.14 2013/06/01 04:56:41 schwarze Exp $ */
+/*	$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,13 +25,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;
@@ -148,7 +148,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);
@@ -263,7 +263,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);