diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-09-10 19:14:49 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-09-10 19:14:49 +0100 |
commit | a77488bab4732c30044b04e97d13707e03825bdf (patch) | |
tree | c2b056265adfe7acd76596ab5433d2ce7f227cd3 /include/dom/core | |
parent | c733e0fbd053ffa80b83839c4114a2a28b3ed2ec (diff) | |
download | libdom-a77488bab4732c30044b04e97d13707e03825bdf.tar.gz libdom-a77488bab4732c30044b04e97d13707e03825bdf.tar.bz2 |
unsigned long -> uint32_t, signed long and long -> int32_t, plus collateral fixes. Test suite does not pass
Diffstat (limited to 'include/dom/core')
-rw-r--r-- | include/dom/core/attr.h | 6 | ||||
-rw-r--r-- | include/dom/core/characterdata.h | 46 | ||||
-rw-r--r-- | include/dom/core/exceptions.h | 2 | ||||
-rw-r--r-- | include/dom/core/namednodemap.h | 6 | ||||
-rw-r--r-- | include/dom/core/nodelist.h | 6 | ||||
-rw-r--r-- | include/dom/core/text.h | 6 |
6 files changed, 36 insertions, 36 deletions
diff --git a/include/dom/core/attr.h b/include/dom/core/attr.h index 69612f7..1ae5be5 100644 --- a/include/dom/core/attr.h +++ b/include/dom/core/attr.h @@ -114,7 +114,7 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result) * Following are our implementation specific APIs. * * These APIs are defined for the purpose that there are some attributes in - * HTML and other DOM module whose type is not DOMString, but unsigned long or + * HTML and other DOM module whose type is not DOMString, but uint32_t or * boolean, for those types of attributes, clients should call one of the * following APIs to set it. * @@ -135,8 +135,8 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result) * dom_attr_get_* functions. */ dom_attr_type dom_attr_get_type(dom_attr *a); -dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value); -dom_exception dom_attr_set_integer(dom_attr *a, unsigned long value); +dom_exception dom_attr_get_integer(dom_attr *a, uint32_t *value); +dom_exception dom_attr_set_integer(dom_attr *a, uint32_t value); dom_exception dom_attr_get_short(dom_attr *a, unsigned short *value); dom_exception dom_attr_set_short(dom_attr *a, unsigned short value); dom_exception dom_attr_get_bool(dom_attr *a, bool *value); diff --git a/include/dom/core/characterdata.h b/include/dom/core/characterdata.h index 174be89..6b894fb 100644 --- a/include/dom/core/characterdata.h +++ b/include/dom/core/characterdata.h @@ -25,22 +25,22 @@ typedef struct dom_characterdata_vtable { dom_string *data); dom_exception (*dom_characterdata_get_length)( struct dom_characterdata *cdata, - unsigned long *length); + uint32_t *length); dom_exception (*dom_characterdata_substring_data)( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data); dom_exception (*dom_characterdata_append_data)( struct dom_characterdata *cdata, dom_string *data); dom_exception (*dom_characterdata_insert_data)( struct dom_characterdata *cdata, - unsigned long offset, dom_string *data); + uint32_t offset, dom_string *data); dom_exception (*dom_characterdata_delete_data)( struct dom_characterdata *cdata, - unsigned long offset, unsigned long count); + uint32_t offset, uint32_t count); dom_exception (*dom_characterdata_replace_data)( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string *data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string *data); } dom_characterdata_vtable; @@ -63,17 +63,17 @@ static inline dom_exception dom_characterdata_set_data( (struct dom_characterdata *) (c), (d)) static inline dom_exception dom_characterdata_get_length( - struct dom_characterdata *cdata, unsigned long *length) + struct dom_characterdata *cdata, uint32_t *length) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_get_length(cdata, length); } #define dom_characterdata_get_length(c, l) dom_characterdata_get_length( \ - (struct dom_characterdata *) (c), (unsigned long *) (l)) + (struct dom_characterdata *) (c), (uint32_t *) (l)) static inline dom_exception dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_substring_data(cdata, offset, count, @@ -81,8 +81,8 @@ static inline dom_exception dom_characterdata_substring_data( } #define dom_characterdata_substring_data(c, o, ct, d) \ dom_characterdata_substring_data( \ - (struct dom_characterdata *) (c), (unsigned long) (o), \ - (unsigned long) (ct), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o), \ + (uint32_t) (ct), (d)) static inline dom_exception dom_characterdata_append_data( struct dom_characterdata *cdata, dom_string *data) @@ -94,29 +94,29 @@ static inline dom_exception dom_characterdata_append_data( (struct dom_characterdata *) (c), (d)) static inline dom_exception dom_characterdata_insert_data( - struct dom_characterdata *cdata, unsigned long offset, + struct dom_characterdata *cdata, uint32_t offset, dom_string *data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_insert_data(cdata, offset, data); } #define dom_characterdata_insert_data(c, o, d) dom_characterdata_insert_data( \ - (struct dom_characterdata *) (c), (unsigned long) (o), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o), (d)) static inline dom_exception dom_characterdata_delete_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_delete_data(cdata, offset, count); } #define dom_characterdata_delete_data(c, o, ct) dom_characterdata_delete_data(\ - (struct dom_characterdata *) (c), (unsigned long) (o), \ - (unsigned long) (ct)) + (struct dom_characterdata *) (c), (uint32_t) (o), \ + (uint32_t) (ct)) static inline dom_exception dom_characterdata_replace_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string *data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string *data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_replace_data(cdata, offset, count, @@ -124,7 +124,7 @@ static inline dom_exception dom_characterdata_replace_data( } #define dom_characterdata_replace_data(c, o, ct, d) \ dom_characterdata_replace_data(\ - (struct dom_characterdata *) (c), (unsigned long) (o),\ - (unsigned long) (ct), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o),\ + (uint32_t) (ct), (d)) #endif diff --git a/include/dom/core/exceptions.h b/include/dom/core/exceptions.h index 04c7f18..67160d1 100644 --- a/include/dom/core/exceptions.h +++ b/include/dom/core/exceptions.h @@ -12,7 +12,7 @@ * Class of a DOM exception. * * The top 16 bits of a dom_exception are a bitfield - * indicating which class the exception belongs to. + * indicating which class the exception beint32_ts to. */ typedef enum { DOM_EXCEPTION_CLASS_NORMAL = 0, diff --git a/include/dom/core/namednodemap.h b/include/dom/core/namednodemap.h index fc5e886..f44e553 100644 --- a/include/dom/core/namednodemap.h +++ b/include/dom/core/namednodemap.h @@ -19,7 +19,7 @@ void dom_namednodemap_ref(struct dom_namednodemap *map); void dom_namednodemap_unref(struct dom_namednodemap *map); dom_exception dom_namednodemap_get_length(struct dom_namednodemap *map, - unsigned long *length); + uint32_t *length); dom_exception _dom_namednodemap_get_named_item(struct dom_namednodemap *map, dom_string *name, struct dom_node **node); @@ -47,10 +47,10 @@ dom_exception _dom_namednodemap_remove_named_item( dom_exception _dom_namednodemap_item(struct dom_namednodemap *map, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); #define dom_namednodemap_item(m, i, n) _dom_namednodemap_item( \ - (dom_namednodemap *) (m), (unsigned long) (i), \ + (dom_namednodemap *) (m), (uint32_t) (i), \ (dom_node **) (n)) diff --git a/include/dom/core/nodelist.h b/include/dom/core/nodelist.h index 2aad313..369a42b 100644 --- a/include/dom/core/nodelist.h +++ b/include/dom/core/nodelist.h @@ -18,11 +18,11 @@ void dom_nodelist_ref(struct dom_nodelist *list); void dom_nodelist_unref(struct dom_nodelist *list); dom_exception dom_nodelist_get_length(struct dom_nodelist *list, - unsigned long *length); + uint32_t *length); dom_exception _dom_nodelist_item(struct dom_nodelist *list, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); #define dom_nodelist_item(l, i, n) _dom_nodelist_item((dom_nodelist *) (l), \ - (unsigned long) (i), (dom_node **) (n)) + (uint32_t) (i), (dom_node **) (n)) #endif diff --git a/include/dom/core/text.h b/include/dom/core/text.h index 1750aec..7bafc8c 100644 --- a/include/dom/core/text.h +++ b/include/dom/core/text.h @@ -21,7 +21,7 @@ typedef struct dom_text_vtable { struct dom_characterdata_vtable base; dom_exception (*dom_text_split_text)(struct dom_text *text, - unsigned long offset, struct dom_text **result); + uint32_t offset, struct dom_text **result); dom_exception (*dom_text_get_is_element_content_whitespace)( struct dom_text *text, bool *result); dom_exception (*dom_text_get_whole_text)(struct dom_text *text, @@ -31,13 +31,13 @@ typedef struct dom_text_vtable { } dom_text_vtable; static inline dom_exception dom_text_split_text(struct dom_text *text, - unsigned long offset, struct dom_text **result) + uint32_t offset, struct dom_text **result) { return ((dom_text_vtable *) ((dom_node *) text)->vtable)-> dom_text_split_text(text, offset, result); } #define dom_text_split_text(t, o, r) dom_text_split_text((dom_text *) (t), \ - (unsigned long) (o), (dom_text **) (r)) + (uint32_t) (o), (dom_text **) (r)) static inline dom_exception dom_text_get_is_element_content_whitespace( struct dom_text *text, bool *result) |