Simple refactor due to yaz_match_xsd_element 0 check YAZ-822

[yaz-moved-to-github.git] / src / xml_to_opac.c

diff --git a/src/xml_to_opac.c b/src/xml_to_opac.c
index 236bf8a..139f12f 100644 (file)
--- a/src/xml_to_opac.c
+++ b/src/xml_to_opac.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -27,7 +27,7 @@ static int match_element_next(xmlNode **ptr, const char *elem, NMEM nmem,
 {
     while (*ptr && (*ptr)->type != XML_ELEMENT_NODE)
         (*ptr) = (*ptr)->next;
-    if (*ptr && yaz_match_xsd_string_n_nmem(*ptr, elem, nmem, val, 0))
+    if (yaz_match_xsd_string_n_nmem(*ptr, elem, nmem, val, 0))
     {
         *ptr = (*ptr)->next;
         return 1;
@@ -42,7 +42,7 @@ static int match_v_next(xmlNode **ptr, const char *elem, NMEM nmem,
     while (*ptr && (*ptr)->type != XML_ELEMENT_NODE)
         (*ptr) = (*ptr)->next;
     *val = nmem_booldup(nmem, 0);
-    if (*ptr && yaz_match_xsd_element(*ptr, elem))
+    if (yaz_match_xsd_element(*ptr, elem))
     {
         struct _xmlAttr *attr = (*ptr)->properties;