X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny_css.c;h=495a39ff9534fb027b258243904a843912dd5fb9;hb=9be0e02afb4bd161a132d8ea98c0541a81189324;hp=7e203a2b70f09b3127108aca03f18e6269a9d582;hpb=9ad3c1bf72a09dc5c196a2ccc582169ce31989da;p=libsvgtiny.git diff --git a/src/svgtiny_css.c b/src/svgtiny_css.c index 7e203a2..495a39f 100644 --- a/src/svgtiny_css.c +++ b/src/svgtiny_css.c @@ -4,6 +4,9 @@ #include "svgtiny.h" #include "svgtiny_internal.h" +css_error svgtiny_resolve_url(void *pw, const char *base, + lwc_string *rel, lwc_string **abs); + /* select handler callbacks */ static css_error node_name(void *pw, void *node, css_qname *qname); static css_error node_classes(void *pw, void *node, @@ -649,15 +652,13 @@ css_error node_has_name(void *pw, void *node, /* Start by checking to see if qname is the universal selector */ state = (struct svgtiny_parse_state *)pw; - if (lwc_string_isequal(qname->name, - state->interned_universal, match) == lwc_error_ok) { - if (*match) { + *match = dom_string_lwc_isequal(state->interned_universal, qname->name); + if (*match) { /* It's the universal selector. In NetSurf, all node * names match the universal selector, and nothing in * the libcss documentation suggests another approach, * so we follow NetSurf here. */ return CSS_OK; - } } err = dom_node_get_node_name((dom_node *)node, &name); @@ -1202,7 +1203,7 @@ static css_error _node_has_attribute_substring(void *pw, void *node, { UNUSED(pw); dom_string *name; - dom_string *attr_val; + dom_string *attr_val = NULL; dom_exception err; size_t attr_len; /* length of attr_val */ size_t substrlen; /* length of "substring" */ @@ -1955,6 +1956,7 @@ static void svgtiny_dom_user_data_handler(dom_node_operation operation, css_libcss_node_data_handler(&svgtiny_select_handler, CSS_NODE_DELETED, NULL, src, NULL, data); + break; default: /* Our list of cases should have been exhaustive */ assert(false);