From 202a9c5ad39758616f73e23aabcbe43aaebea26b Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 21 Feb 2021 10:30:00 +0100
Subject: Fix warnings about xmlChar cast

---
 eel/eel-xml-extensions.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'eel/eel-xml-extensions.c')

diff --git a/eel/eel-xml-extensions.c b/eel/eel-xml-extensions.c
index da2cf6b5..855096c1 100644
--- a/eel/eel-xml-extensions.c
+++ b/eel/eel-xml-extensions.c
@@ -43,25 +43,25 @@ eel_xml_get_children (xmlNodePtr parent)
 }
 
 xmlNodePtr
-eel_xml_get_child_by_name_and_property (xmlNodePtr parent,
-                                        const char *child_name,
-                                        const char *property_name,
-                                        const char *property_value)
+eel_xml_get_child_by_name_and_property (xmlNodePtr     parent,
+                                        const xmlChar *child_name,
+                                        const xmlChar *property_name,
+                                        const xmlChar *property_value)
 {
     xmlNodePtr child;
     xmlChar *property;
     gboolean match;
 
-    if (parent == NULL)
+    if (parent == NULL || property_name == NULL || property_value == NULL)
     {
         return NULL;
     }
-    for (child = eel_xml_get_children (parent); child != NULL; child = child->next)
+    for (child = parent->children; child != NULL; child = child->next)
     {
-        if (strcmp (child->name, child_name) == 0)
+        if (child->name != NULL && xmlStrcmp (child->name, child_name) == 0)
         {
             property = xmlGetProp (child, property_name);
-            match = eel_strcmp (property, property_value) == 0;
+            match = property != NULL && xmlStrcmp (property, property_value) == 0;
             xmlFree (property);
             if (match)
             {
@@ -73,14 +73,13 @@ eel_xml_get_child_by_name_and_property (xmlNodePtr parent,
 }
 
 xmlNodePtr
-eel_xml_get_root_child_by_name_and_property (xmlDocPtr document,
-        const char *child_name,
-        const char *property_name,
-        const char *property_value)
+eel_xml_get_root_child_by_name_and_property (xmlDocPtr      document,
+                                             const xmlChar *child_name,
+                                             const xmlChar *property_name,
+                                             const xmlChar *property_value)
 {
-    return eel_xml_get_child_by_name_and_property
-           (xmlDocGetRootElement (document),
-            child_name,
-            property_name,
-            property_value);
+    return eel_xml_get_child_by_name_and_property (xmlDocGetRootElement (document),
+                                                   child_name,
+                                                   property_name,
+                                                   property_value);
 }
-- 
cgit v1.2.1