Module Name: src
Committed By: christos
Date: Sat Nov 24 22:29:09 UTC 2012
Modified Files:
src/external/bsd/mdocml/dist: tbl_data.c
Log Message:
XXX: rename data() to getdata(). This is to avoid an assembler botch on the
ppc64 toolchain where function names are prefixed with a period, so "data"
becomes ".data" and ".data" is confused by the assembler with the segment
directive with the same name. Clearly this is a toolchain issue; we should
be able to call functions "text" and "data" but it is simpler to fix the
code rather than the toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/tbl_data.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/tbl_data.c
diff -u src/external/bsd/mdocml/dist/tbl_data.c:1.3 src/external/bsd/mdocml/dist/tbl_data.c:1.4
--- src/external/bsd/mdocml/dist/tbl_data.c:1.3 Mon Jan 30 12:03:01 2012
+++ src/external/bsd/mdocml/dist/tbl_data.c Sat Nov 24 17:29:09 2012
@@ -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;
@@ -154,7 +154,7 @@ tbl_cdata(struct tbl_node *tbl, int ln,
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);
@@ -269,7 +269,7 @@ tbl_data(struct tbl_node *tbl, int ln, c
/* 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);
