[Pkg-libvirt-commits] [libguestfs] 182/266: v2v: add xmlXPathRegisterNs for libxml2 binding
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:41:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.
commit b56b90bf6ed5812400e02daea54621834dab96ef
Author: Shahar Havivi <shaharh at redhat.com>
Date: Tue Aug 26 17:19:36 2014 +0300
v2v: add xmlXPathRegisterNs for libxml2 binding
Signed-off-by: Shahar Havivi <shaharh at redhat.com>
---
v2v/xml-c.c | 16 ++++++++++++++++
v2v/xml.ml | 1 +
v2v/xml.mli | 2 ++
3 files changed, 19 insertions(+)
diff --git a/v2v/xml-c.c b/v2v/xml-c.c
index e6e7d16..f26e362 100644
--- a/v2v/xml-c.c
+++ b/v2v/xml-c.c
@@ -31,6 +31,7 @@
#include <caml/mlvalues.h>
#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
#include <libxml/uri.h>
#include "guestfs.h"
@@ -143,6 +144,21 @@ v2v_xml_xpath_new_context (value docv)
}
value
+v2v_xml_xpath_register_ns (value xpathctxv, value prefix, value uri)
+{
+ CAMLparam3 (xpathctxv, prefix, uri);
+ xmlXPathContextPtr xpathctx;
+ int r;
+
+ xpathctx = Xpathctx_val (xpathctxv);
+ r = xmlXPathRegisterNs (xpathctx, BAD_CAST String_val (prefix), BAD_CAST String_val (uri));
+ if (r == -1)
+ caml_invalid_argument ("xpath_register_ns: unable to register namespace");
+
+ CAMLreturn (Val_unit);
+}
+
+value
v2v_xml_xpath_eval_expression (value xpathctxv, value exprv)
{
CAMLparam2 (xpathctxv, exprv);
diff --git a/v2v/xml.ml b/v2v/xml.ml
index 78cb022..fea8784 100644
--- a/v2v/xml.ml
+++ b/v2v/xml.ml
@@ -31,6 +31,7 @@ type node = doc * node_ptr
external parse_memory : string -> doc = "v2v_xml_parse_memory"
external xpath_new_context : doc -> xpathctx = "v2v_xml_xpath_new_context"
external xpath_eval_expression : xpathctx -> string -> xpathobj = "v2v_xml_xpath_eval_expression"
+external xpath_register_ns : xpathctx -> string -> string -> unit = "v2v_xml_xpath_register_ns"
external xpathobj_nr_nodes : xpathobj -> int = "v2v_xml_xpathobj_nr_nodes"
external xpathobj_get_node_ptr : xpathobj -> int -> node_ptr = "v2v_xml_xpathobj_get_node_ptr"
diff --git a/v2v/xml.mli b/v2v/xml.mli
index c725ac0..890fa4e 100644
--- a/v2v/xml.mli
+++ b/v2v/xml.mli
@@ -29,6 +29,8 @@ val xpath_new_context : doc -> xpathctx
(** xmlXPathNewContext *)
val xpath_eval_expression : xpathctx -> string -> xpathobj
(** xmlXPathEvalExpression *)
+val xpath_register_ns : xpathctx -> string -> string -> unit
+(** xmlXPathRegisterNs *)
val xpathobj_nr_nodes : xpathobj -> int
(** Get the number of nodes in the nodeset of the xmlXPathObjectPtr. *)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list