Fixed many compilation warnings.

Virtual private methods lasso_node_get_attr(), lasso_node_get_attrs(),
lasso_node_get_child() and lasso_node_get_children() became virtual public

2 files changed, 128 insertions, 119 deletions

diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index c5117712..88aea43d 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -43,17 +43,45 @@ lasso_node_build_query(LassoNode *node)
   return (class->build_query(node));
 }
 
-xmlChar *
-lasso_node_get_name(LassoNode *node)
+void
+lasso_node_dump(LassoNode *node, const xmlChar *encoding, int format) {
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  class->dump(node, encoding, format);
+}
+
+LassoAttr *
+lasso_node_get_attr(LassoNode *node, const xmlChar *name)
 {
   LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
-  return (class->get_name(node));
+  return (class->get_attr(node, name));
 }
 
-void
-lasso_node_dump(LassoNode *node, const xmlChar *encoding, int format) {
+GPtrArray *
+lasso_node_get_attrs(LassoNode *node)
+{
   LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
-  class->dump(node, encoding, format);
+  return (class->get_attrs(node));
+}
+
+LassoNode *
+lasso_node_get_child(LassoNode *node, const xmlChar *name)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  return (class->get_child(node, name));
+}
+
+GPtrArray *
+lasso_node_get_children(LassoNode *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  return (class->get_children(node));
+}
+
+xmlChar *
+lasso_node_get_name(LassoNode *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  return (class->get_name(node));
 }
 
 void
@@ -94,33 +122,6 @@ lasso_node_add_child(LassoNode *node,
   class->add_child(node, child, unbounded);
 }
 
-static LassoAttr *
-lasso_node_get_attr(LassoNode *node, const xmlChar *name)
-{
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
-  return (class->get_attr(node, name));
-}
-
-static GPtrArray *
-lasso_node_get_attrs(LassoNode *node)
-{
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
-  return (class->get_attrs(node));
-}
-
-static LassoNode *
-lasso_node_get_child(LassoNode *node, const xmlChar *name) {
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
-  return (class->get_child(node, name));
-}
-
-static GPtrArray *
-lasso_node_get_children(LassoNode *node)
-{
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
-  return (class->get_children(node));
-}
-
 static xmlNodePtr
 lasso_node_get_xmlNode(LassoNode *node)
 {
@@ -205,13 +206,13 @@ gdata_build_query_foreach_func(GQuark key_id,
     /* free each val get with xmlGetProp() in lasso_node_impl_serialize() */
     xmlFree(g_ptr_array_index((GPtrArray *)data, i));
   }
-  g_ptr_array_add(array, g_quark_to_string(key_id));
+  g_ptr_array_add(array, (gpointer)g_quark_to_string(key_id));
   g_ptr_array_add(array, str->str);
   g_string_free(str, FALSE);
   g_ptr_array_add((GPtrArray *)user_data, array);
 }
 
-GString *
+static GString *
 lasso_node_impl_build_query(LassoNode *node)
 {
   guint i;
@@ -244,10 +245,79 @@ lasso_node_impl_build_query(LassoNode *node)
   return (query);
 }
 
+static LassoAttr*
+lasso_node_impl_get_attr(LassoNode *node, const xmlChar *name)
+{
+  LassoAttr *prop;
+
+  prop = node->private->node->properties;
+  while (prop != NULL) {
+    if (xmlStrEqual(prop->name, name)) {
+      return (prop);
+    }
+    prop = prop->next;
+  }
+
+  return (NULL);
+}
+
+static GPtrArray *
+lasso_node_impl_get_attrs(LassoNode *node)
+{
+  GPtrArray *attributs;
+  LassoAttr *prop;
+
+  attributs = g_ptr_array_new();
+  
+  prop = node->private->node->properties;
+  while (prop != NULL) {
+    g_ptr_array_add(attributs, prop);
+    prop = prop->next;
+  }
+
+  return (attributs);
+}
+
+static LassoNode *
+lasso_node_impl_get_child(LassoNode *node,
+			  const xmlChar *name)
+{
+  xmlNodePtr cur;
+  
+  cur = node->private->node->children;
+  while (cur != NULL) {
+    if(cur->type == XML_ELEMENT_NODE) {
+      if (xmlStrEqual(cur->name, name)) {
+	return (lasso_node_new(cur));
+      }
+    }
+    cur = cur->next;
+  }
+  return (NULL);
+}
+
+static GPtrArray *
+lasso_node_impl_get_children(LassoNode *node)
+{
+  GPtrArray *children = NULL;
+  xmlNodePtr cur;
+
+  cur = node->private->node->children;
+  if (cur != NULL)
+    children = g_ptr_array_new();
+  
+  while (cur != NULL) {
+    g_ptr_array_add(children, lasso_node_new(cur));
+    cur = cur->next;
+  }
+
+  return (children);
+}
+
 static xmlChar *
 lasso_node_impl_get_name(LassoNode *node)
 {
-  return (node->private->node->name);
+  return ((xmlChar *)(node->private->node->name));
 }
 
 static void
@@ -303,7 +373,7 @@ lasso_node_impl_serialize(LassoNode *node, GData *gd)
   attrs = lasso_node_get_attrs(node);
   for(i=0; i<attrs->len; i++) {
     values = g_ptr_array_new();
-    name = ((LassoAttr *)g_ptr_array_index(attrs, i))->name;
+    name = (xmlChar *)((LassoAttr *)g_ptr_array_index(attrs, i))->name;
     /* val must be xmlFree() */
     val = xmlGetProp(node->private->node, name);
     g_ptr_array_add(values, val);
@@ -338,7 +408,7 @@ lasso_node_impl_serialize(LassoNode *node, GData *gd)
   return (gd);
 }
 
-gchar *
+static gchar *
 lasso_node_impl_url_encode(LassoNode *node,
 			   guint sign_method,
 			   const gchar *key_file)
@@ -389,12 +459,11 @@ lasso_node_impl_add_child(LassoNode *node,
 			  LassoNode *child,
 			  gboolean unbounded)
 {
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
   LassoNode *old_child;
   
   // if child is not unbounded, we search it
   if (!unbounded) {
-    old_child = class->get_child(node, child->private->node->name);
+    old_child = lasso_node_get_child(node, child->private->node->name);
   }
 
   if (!unbounded && old_child != NULL) {
@@ -407,75 +476,6 @@ lasso_node_impl_add_child(LassoNode *node,
   }
 }
 
-static LassoAttr *
-lasso_node_impl_get_attr(LassoNode *node, xmlChar *name)
-{
-  LassoAttr *prop;
-
-  prop = node->private->node->properties;
-  while (prop != NULL) {
-    if (xmlStrEqual(prop->name, name)) {
-      return (prop);
-    }
-    prop = prop->next;
-  }
-
-  return (NULL);
-}
-
-static GPtrArray *
-lasso_node_impl_get_attrs(LassoNode *node)
-{
-  GPtrArray *attributs;
-  LassoAttr *prop;
-
-  attributs = g_ptr_array_new();
-  
-  prop = node->private->node->properties;
-  while (prop != NULL) {
-    g_ptr_array_add(attributs, prop);
-    prop = prop->next;
-  }
-
-  return (attributs);
-}
-
-static LassoNode *
-lasso_node_impl_get_child(LassoNode *node,
-			  const xmlChar *name)
-{
-  xmlNodePtr cur;
-  
-  cur = node->private->node->children;
-  while (cur != NULL) {
-    if(cur->type == XML_ELEMENT_NODE) {
-      if (xmlStrEqual(cur->name, name)) {
-	return (lasso_node_new(cur));
-      }
-    }
-    cur = cur->next;
-  }
-  return (NULL);
-}
-
-static GPtrArray *
-lasso_node_impl_get_children(LassoNode *node)
-{
-  GPtrArray *children = NULL;
-  xmlNodePtr cur;
-
-  cur = node->private->node->children;
-  if (cur != NULL)
-    children = g_ptr_array_new();
-  
-  while (cur != NULL) {
-    g_ptr_array_add(children, lasso_node_new(cur));
-    cur = cur->next;
-  }
-
-  return (children);
-}
-
 static xmlNodePtr
 lasso_node_impl_get_xmlNode(LassoNode *node)
 {
@@ -488,11 +488,10 @@ lasso_node_impl_new_child(LassoNode *node,
 			  const xmlChar *content,
 			  gboolean unbounded)
 {
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
   LassoNode *old_child;
   
   if (!unbounded) {
-    old_child = class->get_child(node, name);
+    old_child = lasso_node_get_child(node, name);
   }
 
   if (!unbounded && old_child != NULL)
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index bfaf28c8..65aecc62 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -61,6 +61,12 @@ struct _LassoNodeClass {
   /*< vtable >*/
   /*< public >*/
   GString *   (* build_query)  (LassoNode     *node);
+  LassoAttr*  (* get_attr)     (LassoNode     *,
+				const xmlChar *);
+  GPtrArray*  (* get_attrs)    (LassoNode     *);
+  LassoNode*  (* get_child)    (LassoNode     *,
+				const xmlChar *);
+  GPtrArray*  (* get_children) (LassoNode     *);
   xmlChar *   (* get_name)     (LassoNode     *);
   void        (* dump)         (LassoNode     *,
 				const xmlChar *,
@@ -74,12 +80,6 @@ struct _LassoNodeClass {
   void       (* add_child)    (LassoNode *,
 			       LassoNode *,
 			       gboolean);
-  LassoAttr* (* get_attr)     (LassoNode     *,
-				const xmlChar *);
-  GPtrArray* (* get_attrs)    (LassoNode     *);
-  LassoNode* (* get_child)    (LassoNode     *,
-			       const xmlChar *);
-  GPtrArray* (* get_children) (LassoNode     *);
   xmlNodePtr (* get_xmlNode)  (LassoNode     *);
   void       (* new_child)    (LassoNode     *,
 			       const xmlChar *,
@@ -110,12 +110,22 @@ LASSO_EXPORT LassoNode* lasso_node_new(xmlNodePtr node);
 
 LASSO_EXPORT GString*   lasso_node_build_query  (LassoNode *node);
 
-LASSO_EXPORT xmlChar*   lasso_node_get_name     (LassoNode *node);
-
 LASSO_EXPORT void       lasso_node_dump         (LassoNode     *,
 						 const xmlChar *,
 						 int);
 
+LASSO_EXPORT LassoAttr* lasso_node_get_attr     (LassoNode *node,
+						 const xmlChar *name);
+
+LASSO_EXPORT GPtrArray* lasso_node_get_attrs    (LassoNode *node);
+
+LASSO_EXPORT LassoNode* lasso_node_get_child    (LassoNode *node,
+						 const xmlChar *name);
+
+LASSO_EXPORT GPtrArray* lasso_node_get_children (LassoNode *node);
+
+LASSO_EXPORT xmlChar*   lasso_node_get_name     (LassoNode *node);
+
 LASSO_EXPORT void       lasso_node_rename_prop  (LassoNode *node,
 						 const xmlChar *old_name,
 						 const xmlChar *new_name);