From bb8f6c2adbc9f78801d49d3c748d2abe9d4c43a9 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 25 Oct 2015 23:20:09 +0000 Subject: Update the html table cell element API to use dom_ulong where apropriate --- include/dom/html/html_tablecell_element.h | 12 +++++++----- src/html/html_tablecell_element.c | 18 +++++++++--------- .../tests/level1/html/HTMLTableCellElement15.xml | 2 +- .../tests/level1/html/HTMLTableCellElement16.xml | 2 +- .../tests/level1/html/HTMLTableCellElement23.xml | 2 +- .../tests/level1/html/HTMLTableCellElement24.xml | 2 +- test/testcases/tests/level1/html/table25.xml | 2 +- test/testcases/tests/level1/html/table28.xml | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/include/dom/html/html_tablecell_element.h b/include/dom/html/html_tablecell_element.h index 938d148d..9d5c152d 100644 --- a/include/dom/html/html_tablecell_element.h +++ b/include/dom/html/html_tablecell_element.h @@ -10,13 +10,15 @@ #define dom_html_table_cell_element_h_ #include + +#include #include #include typedef struct dom_html_table_cell_element dom_html_table_cell_element; dom_exception dom_html_table_cell_element_get_cell_index( - dom_html_table_cell_element *table_cell, int32_t *cell_index); + dom_html_table_cell_element *table_cell, dom_long *cell_index); dom_exception dom_html_table_cell_element_get_abbr( dom_html_table_cell_element *table_cell, dom_string **abbr); @@ -85,16 +87,16 @@ dom_exception dom_html_table_cell_element_set_width( dom_html_table_cell_element *table_cell, dom_string *width); dom_exception dom_html_table_cell_element_get_col_span( - dom_html_table_cell_element *table_cell, int32_t *col_span); + dom_html_table_cell_element *table_cell, dom_ulong *col_span); dom_exception dom_html_table_cell_element_set_col_span( - dom_html_table_cell_element *table_cell, uint32_t col_span); + dom_html_table_cell_element *table_cell, dom_ulong col_span); dom_exception dom_html_table_cell_element_get_row_span( - dom_html_table_cell_element *table_cell, int32_t *row_span); + dom_html_table_cell_element *table_cell, dom_ulong *row_span); dom_exception dom_html_table_cell_element_set_row_span( - dom_html_table_cell_element *table_cell, uint32_t row_span); + dom_html_table_cell_element *table_cell, dom_ulong row_span); dom_exception dom_html_table_cell_element_get_no_wrap( dom_html_table_cell_element *ele, bool *no_wrap); diff --git a/src/html/html_tablecell_element.c b/src/html/html_tablecell_element.c index 403e7962..796bbc9a 100644 --- a/src/html/html_tablecell_element.c +++ b/src/html/html_tablecell_element.c @@ -178,7 +178,7 @@ SIMPLE_GET_SET(width); * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_table_cell_element_get_cell_index( - dom_html_table_cell_element *table_cell, int32_t *cell_index) + dom_html_table_cell_element *table_cell, dom_long *cell_index) { dom_node_internal *n = ((dom_node_internal *)table_cell)->parent; dom_html_document *doc = (dom_html_document *)(n->owner); @@ -231,9 +231,9 @@ dom_exception dom_html_table_cell_element_get_cell_index( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_table_cell_element_get_col_span( - dom_html_table_cell_element *table_cell, int32_t *col_span) + dom_html_table_cell_element *table_cell, dom_ulong *col_span) { - return dom_html_element_get_int32_t_property(&table_cell->base, "colspan", + return dom_html_element_get_dom_ulong_property(&table_cell->base, "colspan", SLEN("colspan"), col_span); } @@ -245,9 +245,9 @@ dom_exception dom_html_table_cell_element_get_col_span( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_table_cell_element_set_col_span( - dom_html_table_cell_element *table_cell, uint32_t col_span) + dom_html_table_cell_element *table_cell, dom_ulong col_span) { - return dom_html_element_set_int32_t_property(&table_cell->base, "colspan", + return dom_html_element_set_dom_ulong_property(&table_cell->base, "colspan", SLEN("colspan"), col_span); } @@ -259,9 +259,9 @@ dom_exception dom_html_table_cell_element_set_col_span( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_table_cell_element_get_row_span( - dom_html_table_cell_element *table_cell, int32_t *row_span) + dom_html_table_cell_element *table_cell, dom_ulong *row_span) { - return dom_html_element_get_int32_t_property(&table_cell->base, "rowspan", + return dom_html_element_get_dom_ulong_property(&table_cell->base, "rowspan", SLEN("rowspan"), row_span); } @@ -273,9 +273,9 @@ dom_exception dom_html_table_cell_element_get_row_span( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_table_cell_element_set_row_span( - dom_html_table_cell_element *table_cell, uint32_t row_span) + dom_html_table_cell_element *table_cell, dom_ulong row_span) { - return dom_html_element_set_int32_t_property(&table_cell->base, "rowspan", + return dom_html_element_set_dom_ulong_property(&table_cell->base, "rowspan", SLEN("rowspan"), row_span); } diff --git a/test/testcases/tests/level1/html/HTMLTableCellElement15.xml b/test/testcases/tests/level1/html/HTMLTableCellElement15.xml index b4762537..90457d20 100644 --- a/test/testcases/tests/level1/html/HTMLTableCellElement15.xml +++ b/test/testcases/tests/level1/html/HTMLTableCellElement15.xml @@ -33,7 +33,7 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. - + diff --git a/test/testcases/tests/level1/html/HTMLTableCellElement16.xml b/test/testcases/tests/level1/html/HTMLTableCellElement16.xml index f5a74081..c59a18d3 100644 --- a/test/testcases/tests/level1/html/HTMLTableCellElement16.xml +++ b/test/testcases/tests/level1/html/HTMLTableCellElement16.xml @@ -33,7 +33,7 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. - + diff --git a/test/testcases/tests/level1/html/HTMLTableCellElement23.xml b/test/testcases/tests/level1/html/HTMLTableCellElement23.xml index b276fbc7..c5f30f88 100644 --- a/test/testcases/tests/level1/html/HTMLTableCellElement23.xml +++ b/test/testcases/tests/level1/html/HTMLTableCellElement23.xml @@ -33,7 +33,7 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. - + diff --git a/test/testcases/tests/level1/html/HTMLTableCellElement24.xml b/test/testcases/tests/level1/html/HTMLTableCellElement24.xml index 3679bee3..effeeacf 100644 --- a/test/testcases/tests/level1/html/HTMLTableCellElement24.xml +++ b/test/testcases/tests/level1/html/HTMLTableCellElement24.xml @@ -33,7 +33,7 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. - + diff --git a/test/testcases/tests/level1/html/table25.xml b/test/testcases/tests/level1/html/table25.xml index b8e10ddc..507edf54 100644 --- a/test/testcases/tests/level1/html/table25.xml +++ b/test/testcases/tests/level1/html/table25.xml @@ -29,7 +29,7 @@ The value of attribute colspan of the tablecell element is read and checked agai - + diff --git a/test/testcases/tests/level1/html/table28.xml b/test/testcases/tests/level1/html/table28.xml index d445a1c4..3b5ee461 100644 --- a/test/testcases/tests/level1/html/table28.xml +++ b/test/testcases/tests/level1/html/table28.xml @@ -29,7 +29,7 @@ The value of attribute rowspan of the tablecell element is read and checked agai - + -- cgit v1.2.1