summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValery Febvre <vfebvre at easter-eggs.com>2004-07-28 15:49:42 +0000
committerValery Febvre <vfebvre at easter-eggs.com>2004-07-28 15:49:42 +0000
commit123c88ac776d84210d9c822f78411f6ed9300dfd (patch)
tree6c6e752e45f2e1e9f4801ba709a7a54d302ca78c
parent6a204dd2028048ebc0a19caa51d9069d7114e8c2 (diff)
downloadlasso-123c88ac776d84210d9c822f78411f6ed9300dfd.tar.gz
lasso-123c88ac776d84210d9c822f78411f6ed9300dfd.tar.xz
lasso-123c88ac776d84210d9c822f78411f6ed9300dfd.zip
lasso_node_get_name now returns now an xmlChar* (instead of a const xmlChar*)
-rw-r--r--lasso/xml/xml.c8
-rw-r--r--lasso/xml/xml.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 49bafd70..1272204a 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -323,7 +323,7 @@ lasso_node_get_content(LassoNode *node)
*
* Return value: the name of the node
**/
-const xmlChar *
+xmlChar *
lasso_node_get_name(LassoNode *node)
{
g_return_val_if_fail (LASSO_IS_NODE(node), NULL);
@@ -873,7 +873,7 @@ lasso_node_impl_get_content(LassoNode *node)
return (xmlNodeGetContent(node->private->node));
}
-static const xmlChar *
+static xmlChar *
lasso_node_impl_get_name(LassoNode *node)
{
g_return_val_if_fail (LASSO_IS_NODE(node), NULL);
@@ -1193,7 +1193,7 @@ lasso_node_impl_serialize(LassoNode *node,
{
GPtrArray *attrs, *children;
GPtrArray *values;
- const xmlChar *name;
+ xmlChar *name;
xmlChar *val;
int i;
@@ -1349,9 +1349,11 @@ lasso_node_finalize(LassoNode *node)
if (node->private->node_is_weak_ref == FALSE) {
xmlUnlinkNode(node->private->node);
xmlFreeNode(node->private->node);
+ node->private->node = NULL;
}
g_free (node->private);
+ node->private = NULL;
parent_class->finalize(G_OBJECT(node));
}
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index 4e1e9028..8fabbc7c 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -176,7 +176,7 @@ LASSO_EXPORT GPtrArray* lasso_node_get_children (LassoNode *node);
LASSO_EXPORT xmlChar* lasso_node_get_content (LassoNode *node);
-LASSO_EXPORT const xmlChar* lasso_node_get_name (LassoNode *node);
+LASSO_EXPORT const xmlChar* lasso_node_get_name (LassoNode *node);
LASSO_EXPORT void lasso_node_import (LassoNode *node,
const xmlChar *buffer);