summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2009-03-27 15:05:21 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2009-03-27 15:05:21 +0000
commit642dcfdfbbf3909c03f9a088eb8e0c461e9dade5 (patch)
treeefb3cd47fb2f973a851cd28a03098df5190a11f9
parent580239d23382b8968060fdd49a19a489817c772a (diff)
downloadlasso-642dcfdfbbf3909c03f9a088eb8e0c461e9dade5.tar.gz
lasso-642dcfdfbbf3909c03f9a088eb8e0c461e9dade5.tar.xz
lasso-642dcfdfbbf3909c03f9a088eb8e0c461e9dade5.zip
Core: use lasso_xml_parse_memory instead of xmlParseDoc
* lasso/id-ff/provider.c: use internal wrapper instead of direct call to libxml for parsing.
-rw-r--r--lasso/id-ff/provider.c8
-rw-r--r--lasso/xml/tools.c2
-rw-r--r--lasso/xml/xml.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index fcb89c1b..81b9125d 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -701,7 +701,7 @@ lasso_provider_load_metadata_from_buffer(LassoProvider *provider, const gchar *m
gboolean rc = TRUE;
g_return_val_if_fail(LASSO_IS_PROVIDER(provider), FALSE);
- doc = xmlParseDoc((xmlChar*)metadata);
+ doc = lasso_xml_parse_memory(metadata, strlen(metadata));
if (doc == NULL) {
char *extract;
extract = lasso_safe_prefix_string(metadata, 80);
@@ -1059,7 +1059,7 @@ lasso_provider_new_from_dump(const gchar *dump)
return NULL;
provider = g_object_new(LASSO_TYPE_PROVIDER, NULL);
- doc = xmlParseMemory(dump, strlen(dump));
+ doc = lasso_xml_parse_memory(dump, strlen(dump));
init_from_xml(LASSO_NODE(provider), xmlDocGetRootElement(doc));
lasso_release_doc(doc);
@@ -1151,9 +1151,9 @@ lasso_provider_verify_signature(LassoProvider *provider,
if (len < 0) {
goto_exit_with_rc(LASSO_PROFILE_ERROR_INVALID_MSG);
}
- doc = xmlParseMemory(msg, strlen(msg));
+ doc = lasso_xml_parse_memory(msg, strlen(msg));
} else {
- doc = xmlParseMemory(msg, strlen(msg));
+ doc = lasso_xml_parse_memory(msg, strlen(msg));
msg = NULL;
}
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index 884b7fd0..61c51a58 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -934,7 +934,7 @@ lasso_node_init_from_deflated_query_part(LassoNode *node, char *deflate_string)
inflateEnd(&zstr);
xmlFree(zre);
- doc = xmlParseMemory((char*)re, strlen((char*)re));
+ doc = lasso_xml_parse_memory((char*)re, strlen((char*)re));
xmlFree(re);
root = xmlDocGetRootElement(doc);
lasso_node_init_from_xml(node, root);
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index ceebc451..727f586a 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1800,7 +1800,7 @@ lasso_node_init_from_message_with_format(LassoNode *node, const char *message, L
if (strchr(msg, '<')) {
gboolean is_soap = FALSE;
- doc = xmlParseMemory(msg, strlen(msg));
+ doc = lasso_xml_parse_memory(msg, strlen(msg));
if (doc == NULL) {
rc = LASSO_MESSAGE_FORMAT_UNKNOWN;
goto cleanup;