Merge NetBSD's r1.4: Rename data to getdata to work around bugs in the

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 7413aa2d83dd5fd545677e1a666c53740f6a5d7a..9c56002fa543570049aa8d450c700490ceb753d6 100644 (file)
--- 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 <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -29,13 +29,13 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
 #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
                                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;
                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++;
                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);
                } 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])
        /* 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);
                        return(0);
 
        return(1);