unsigned long -> uint32_t, signed long and long -> int32_t, plus collateral fixes. Test suite does not pass

3 files changed, 14 insertions, 14 deletions

diff --git a/test/testutils/domtsasserts.c b/test/testutils/domtsasserts.c
index e5220e0a..41cacf21 100644
--- a/test/testutils/domtsasserts.c
+++ b/test/testutils/domtsasserts.c
@@ -50,7 +50,7 @@ bool is_same_int(int expected, int actual)
 	return expected == actual;
 }
 
-bool is_same_unsigned_long(unsigned long expected, unsigned long actual)
+bool is_same_unsigned_int32_t(uint32_t expected, uint32_t actual)
 {
 	return expected == actual;
 }
@@ -69,7 +69,7 @@ bool is_equals_bool(bool expected, bool actual, bool dummy)
 	return expected == actual;
 }
 
-bool is_equals_unsigned_long(unsigned long expected, unsigned long actual, bool dummy)
+bool is_equals_unsigned_int32_t(uint32_t expected, uint32_t actual, bool dummy)
 {
 	UNUSED(dummy);
 
@@ -156,9 +156,9 @@ bool is_instanceof(const char *type, dom_node *node)
 }
 
 
-bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map)
+bool is_size_domnamednodemap(uint32_t size, dom_namednodemap *map)
 {
-	unsigned long len;
+	uint32_t len;
 	dom_exception err;
 
 	err = dom_namednodemap_get_length(map, &len);
@@ -170,9 +170,9 @@ bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map)
 	return size == len;
 }
 
-bool is_size_domnodelist(unsigned long size, dom_nodelist *list)
+bool is_size_domnodelist(uint32_t size, dom_nodelist *list)
 {
-	unsigned long len;
+	uint32_t len;
 	dom_exception err;
 
 	err = dom_nodelist_get_length(list, &len);
@@ -184,7 +184,7 @@ bool is_size_domnodelist(unsigned long size, dom_nodelist *list)
 	return size == len;
 }
 
-bool is_size_list(unsigned long size, list *list)
+bool is_size_list(uint32_t size, list *list)
 {
 	return size == list->size;
 }
diff --git a/test/testutils/domtsasserts.h b/test/testutils/domtsasserts.h
index bc214e86..e18509c3 100644
--- a/test/testutils/domtsasserts.h
+++ b/test/testutils/domtsasserts.h
@@ -30,10 +30,10 @@ bool is_null(void *arg);
 
 bool is_same(void *excepted, void *actual);
 bool is_same_int(int excepted, int actual);
-bool is_same_unsigned_long(unsigned long excepted, unsigned long actual);
+bool is_same_unsigned_int32_t(uint32_t excepted, uint32_t actual);
 
 bool is_equals_int(int excepted, int actual, bool dummy);
-bool is_equals_unsigned_long(unsigned long excepted, unsigned long actual, bool dummy);
+bool is_equals_unsigned_int32_t(uint32_t excepted, uint32_t actual, bool dummy);
 bool is_equals_bool(bool excepted, bool actual, bool dummy);
 bool is_equals_string(const char *excepted, dom_string *actual, 
 		bool ignoreCase);
@@ -45,9 +45,9 @@ bool is_equals_list(list *expected, list *actual, bool ignoreCase);
 
 bool is_instanceof(const char *type, dom_node *node);
 
-bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map);
-bool is_size_domnodelist(unsigned long size, dom_nodelist *list);
-bool is_size_list(unsigned long size, list *list);
+bool is_size_domnamednodemap(uint32_t size, dom_namednodemap *map);
+bool is_size_domnodelist(uint32_t size, dom_nodelist *list);
+bool is_size_list(uint32_t size, list *list);
 
 bool is_uri_equals(const char *scheme, const char *path, const char *host, 
                    const char *file, const char *name, const char *query,
diff --git a/test/testutils/foreach.c b/test/testutils/foreach.c
index 764920c6..e068201b 100644
--- a/test/testutils/foreach.c
+++ b/test/testutils/foreach.c
@@ -38,7 +38,7 @@ void foreach_initialise_domnamednodemap(dom_namednodemap *map, unsigned int *ite
 bool _get_next_domnodelist(dom_nodelist *list, unsigned int *iterator, dom_node **ret)
 {
 	dom_exception err;
-	unsigned long len;
+	uint32_t len;
 
 	err = dom_nodelist_get_length(list, &len);
 	if (err != DOM_NO_ERR)
@@ -80,7 +80,7 @@ bool get_next_list(list *list, unsigned int *iterator, void **ret)
 bool _get_next_domnamednodemap(dom_namednodemap *map, unsigned int *iterator, dom_node **ret)
 {
 	dom_exception err;
-	unsigned long len;
+	uint32_t len;
 
 	err = dom_namednodemap_get_length(map, &len);
 	if (err != DOM_NO_ERR)