diff options
| -rw-r--r-- | css/select.c | 12 | ||||
| -rw-r--r-- | framebuffer/Makefile.target | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/css/select.c b/css/select.c index 6bc507078..9d6edc308 100644 --- a/css/select.c +++ b/css/select.c @@ -1074,7 +1074,7 @@ css_error node_has_attribute_equal(void *pw, void *node, return CSS_NOMEM; err = dom_element_get_attribute(n, name, &atr_val); - if ((err != DOM_NO_ERR) && (atr_val != NULL)) { + if ((err != DOM_NO_ERR) || (atr_val == NULL)) { dom_string_unref(name); *match = false; return CSS_OK; @@ -1126,7 +1126,7 @@ css_error node_has_attribute_dashmatch(void *pw, void *node, return CSS_NOMEM; err = dom_element_get_attribute(n, name, &atr_val); - if ((err != DOM_NO_ERR) && (atr_val != NULL)) { + if ((err != DOM_NO_ERR) || (atr_val == NULL)) { dom_string_unref(name); *match = false; return CSS_OK; @@ -1193,7 +1193,7 @@ css_error node_has_attribute_includes(void *pw, void *node, return CSS_NOMEM; err = dom_element_get_attribute(n, name, &atr_val); - if ((err != DOM_NO_ERR) && (atr_val != NULL)) { + if ((err != DOM_NO_ERR) || (atr_val == NULL)) { dom_string_unref(name); *match = false; return CSS_OK; @@ -1261,7 +1261,7 @@ css_error node_has_attribute_prefix(void *pw, void *node, return CSS_NOMEM; err = dom_element_get_attribute(n, name, &atr_val); - if ((err != DOM_NO_ERR) && (atr_val != NULL)) { + if ((err != DOM_NO_ERR) || (atr_val == NULL)) { dom_string_unref(name); *match = false; return CSS_OK; @@ -1325,7 +1325,7 @@ css_error node_has_attribute_suffix(void *pw, void *node, return CSS_NOMEM; err = dom_element_get_attribute(n, name, &atr_val); - if ((err != DOM_NO_ERR) && (atr_val != NULL)) { + if ((err != DOM_NO_ERR) || (atr_val == NULL)) { dom_string_unref(name); *match = false; return CSS_OK; @@ -1393,7 +1393,7 @@ css_error node_has_attribute_substring(void *pw, void *node, return CSS_NOMEM; err = dom_element_get_attribute(n, name, &atr_val); - if ((err != DOM_NO_ERR) && (atr_val != NULL)) { + if ((err != DOM_NO_ERR) || (atr_val == NULL)) { dom_string_unref(name); *match = false; return CSS_OK; diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index 425faacaf..af5891bc2 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -58,12 +58,12 @@ ifeq ($(HOST),mint) # xml-config returns -lsocket which is not needed and does not # exist on all systems. because of that - hardcoded reference to # libxml-2.0 here. - LDFLAGS += -L/usr/lib/ -lxml2 -lz -liconv + LDFLAGS += -L/usr/lib/ -lz -liconv LDFLAGS += -lm else CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub openssl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom openssl) LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss) endif |