From 399da01ae4eb5c5e3e9349bacc2063c946c3d4a1 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Tue, 11 Aug 2009 11:17:23 +0000 Subject: Merge the branches/struggleyb/libdom-remain back to trunk. svn path=/trunk/dom/; revision=9191 --- include/dom/core/attr.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'include/dom/core/attr.h') diff --git a/include/dom/core/attr.h b/include/dom/core/attr.h index b0d98c1..7ac3956 100644 --- a/include/dom/core/attr.h +++ b/include/dom/core/attr.h @@ -27,12 +27,13 @@ typedef struct dom_attr_vtable { dom_exception (*dom_attr_get_name)(struct dom_attr *attr, struct dom_string **result); - dom_exception (*dom_attr_get_specified)(struct dom_attr *attr, bool *result); + dom_exception (*dom_attr_get_specified)(struct dom_attr *attr, + bool *result); dom_exception (*dom_attr_get_value)(struct dom_attr *attr, struct dom_string **result); dom_exception (*dom_attr_set_value)(struct dom_attr *attr, struct dom_string *value); - dom_exception (*dom_attr_get_owner)(struct dom_attr *attr, + dom_exception (*dom_attr_get_owner_element)(struct dom_attr *attr, struct dom_element **result); dom_exception (*dom_attr_get_schema_type_info)(struct dom_attr *attr, struct dom_type_info **result); @@ -48,7 +49,8 @@ static inline dom_exception dom_attr_get_name(struct dom_attr *attr, #define dom_attr_get_name(a, r) dom_attr_get_name((struct dom_attr *) (a), \ (struct dom_string **) (r)) -static inline dom_exception dom_attr_get_specified(struct dom_attr *attr, bool *result) +static inline dom_exception dom_attr_get_specified(struct dom_attr *attr, + bool *result) { return ((dom_attr_vtable *) ((dom_node *) attr)->vtable)-> dom_attr_get_specified(attr, result); @@ -74,17 +76,17 @@ static inline dom_exception dom_attr_set_value(struct dom_attr *attr, #define dom_attr_set_value(a, v) dom_attr_set_value((struct dom_attr *) (a), \ (struct dom_string *) (v)) -static inline dom_exception dom_attr_get_owner(struct dom_attr *attr, +static inline dom_exception dom_attr_get_owner_element(struct dom_attr *attr, struct dom_element **result) { return ((dom_attr_vtable *) ((dom_node *) attr)->vtable)-> - dom_attr_get_owner(attr, result); + dom_attr_get_owner_element(attr, result); } -#define dom_attr_get_owner(a, r) dom_attr_get_owner((struct dom_attr *) (a), \ - (struct dom_element **) (r)) +#define dom_attr_get_owner_element(a, r) dom_attr_get_owner_element(\ + (struct dom_attr *) (a), (struct dom_element **) (r)) -static inline dom_exception dom_attr_get_schema_type_info(struct dom_attr *attr, - struct dom_type_info **result) +static inline dom_exception dom_attr_get_schema_type_info( + struct dom_attr *attr, struct dom_type_info **result) { return ((dom_attr_vtable *) ((dom_node *) attr)->vtable)-> dom_attr_get_schema_type_info(attr, result); -- cgit v1.2.3