search for: docv

...Copyright (C) 2017 SUSE Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,7 +53,7 @@ static struct custom_operations docptr_custom_operations = { }; value -v2v_xml_free_docptr (value docv) +mllib_xml_free_docptr (value docv) { CAMLparam1 (docv); xmlDocPtr doc = docptr_val (docv); @@ -74,7 +75,7 @@ static struct custom_operations xpathctxptr_custom_operations = { }; value -v2v_xml_free_xpathctxptr (value xpathctxv) +mllib_xml_free_xpathctxptr (value xpathctxv) { CAMLpa...

...xpathobj i :: !nodes done; List.rev !nodes in diff --git a/v2v/xml-c.c b/v2v/xml-c.c index 2602766..d2d895c 100644 --- a/v2v/xml-c.c +++ b/v2v/xml-c.c @@ -40,60 +40,53 @@ /* xmlDocPtr type */ #define Doc_val(v) (*((xmlDocPtr *)Data_custom_val(v))) -static void -doc_finalize (value docv) -{ - xmlDocPtr doc = Doc_val (docv); - - if (doc) - xmlFreeDoc (doc); -} - static struct custom_operations doc_custom_operations = { (char *) "doc_custom_operations", - doc_finalize, + custom_finalize_default, custom_compare_default, custom_hash_default, custom_serial...

...xpathobj i :: !nodes done; List.rev !nodes in diff --git a/v2v/xml-c.c b/v2v/xml-c.c index 2602766..13627e1 100644 --- a/v2v/xml-c.c +++ b/v2v/xml-c.c @@ -40,60 +40,53 @@ /* xmlDocPtr type */ #define Doc_val(v) (*((xmlDocPtr *)Data_custom_val(v))) -static void -doc_finalize (value docv) -{ - xmlDocPtr doc = Doc_val (docv); - - if (doc) - xmlFreeDoc (doc); -} - static struct custom_operations doc_custom_operations = { (char *) "doc_custom_operations", - doc_finalize, + custom_finalize_default, custom_compare_default, custom_hash_default, custom_serial...

In version 2: - No substantial change, I just tidied up the code a bit. - Removed one case where whitespace changes had crept in. Rich.

...in CAMLparam and CAMLlocal..., Following is the patch: =================================================================================== diff --git a/v2v/xml-c.c b/v2v/xml-c.c index 4c9bc77..a917c24 100644 --- a/v2v/xml-c.c +++ b/v2v/xml-c.c @@ -141,6 +141,16 @@ v2v_xml_xpath_new_context (value docv) } value +v2v_xml_xpath_register_ns (value prefix, value uri, value xpathctx) +{ + CAMLparam3 (prefix, uri, xpathctx); + CAMLlocal1 (retval); + retval = xmlXPathRegisterNs (BAD_CAST String_val (prefix), BAD_CAST String_val (uri), xpathctx); + + CAMLreturn (retval); +} + +value v2v_xml_xpat...

Hi all, Here is a new version of the virt-builder-repository series taking care of Pino's comments. It has also been rebased on recent master. Cédric Bosdonnat (7): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: expose libosinfo DB reading functions in mllib builder: rename docs test script builder: add

Hi guys, Here is a v3 of the series, including changes to answer Richard's comments. Cédric Bosdonnat (10): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: add Xml.parse_file helper lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo

...#include <libxml/xpath.h> #include <libxml/xpathInternals.h> #include <libxml/uri.h> +#include "libxml2-utils.h" + #pragma GCC diagnostic ignored "-Wmissing-prototypes" /* xmlDocPtr type */ @@ -426,16 +430,11 @@ mllib_xml_doc_get_root_element (value docv) } } -value -mllib_xml_parse_uri (value strv) +static value +Val_uri (xmlURIPtr uri) { - CAMLparam1 (strv); + CAMLparam0 (); CAMLlocal3 (rv, sv, ov); - xmlURIPtr uri; - - uri = xmlParseURI (String_val (strv)); - if (uri == NULL) - caml_invalid_argument ("parse_uri: unable to...

...#include <libxml/xpath.h> #include <libxml/xpathInternals.h> #include <libxml/uri.h> +#include "libxml2-utils.h" + #pragma GCC diagnostic ignored "-Wmissing-prototypes" /* xmlDocPtr type */ @@ -426,16 +430,11 @@ mllib_xml_doc_get_root_element (value docv) } } -value -mllib_xml_parse_uri (value strv) +static value +Val_uri (xmlURIPtr uri) { - CAMLparam1 (strv); + CAMLparam0 (); CAMLlocal3 (rv, sv, ov); - xmlURIPtr uri; - - uri = xmlParseURI (String_val (strv)); - if (uri == NULL) - caml_invalid_argument ("parse_uri: unable to...

An alternate solution to: https://www.redhat.com/archives/libguestfs/2017-December/msg00035.html "[PATCH] v2v: -i vmx: Allow ssh URLs to use spaces." is to classify all URLs processed by libguestfs as either ordinary URLs or the special non-standard URLs that we use for things like ‘virt-v2v -i vmx’ and ‘guestfish --add’. For the non-standard URLs, provide a wrapper around

Previously posted: https://www.redhat.com/archives/libguestfs/2017-December/msg00046.html Rich.

...while (len > 0) { + r = write (fd, buf, len); + if (r == -1) + error (EXIT_FAILURE, errno, "write"); + buf += r; + len -= r; + } +} + +static void +show_help (value specsv, value usage_msgv) +{ + CAMLparam2 (specsv, usage_msgv); + CAMLlocal4 (specv, keysv, actionv, docv); + FILE *f; + CLEANUP_FREE char *buf = NULL; + size_t buf_len = 0; + size_t i, specs_len; + + f = open_memstream (&buf, &buf_len); + if (f == NULL) + error (EXIT_FAILURE, errno, "open_memstream"); + + fprintf (f, _("%s\n" + "Options:\n&quot...

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

...while (len > 0) { + r = write (fd, buf, len); + if (r == -1) + error (EXIT_FAILURE, errno, "write"); + buf += r; + len -= r; + } +} + +static void +show_help (value specsv, value usage_msgv) +{ + CAMLparam2 (specsv, usage_msgv); + CAMLlocal4 (specv, keysv, actionv, docv); + FILE *f; + CLEANUP_FREE char *buf = NULL; + size_t buf_len = 0; + size_t i, specs_len; + + f = open_memstream (&buf, &buf_len); + if (f == NULL) + error (EXIT_FAILURE, errno, "open_memstream"); + + fprintf (f, _("%s: %s\n" + "Options:\n&...

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid

...q?GWWjZuG#iN(XkQg-sP_`HdU*N1&jJD#8V>)Z}-HfhsG!24I;r}Q7 zq3M42ur4N>6(-T{<#|g5=ZRwzlax!=B-%{c0Rt|;NZDKBlBrUKh94der{uvY&~_Qf zS%8$Lz|1=76S|pvV}I=D#$h1Zw at BT>^Gd&*&^M=sH?z(jWZh_*XU$fV(PDSRGu|hM z{lf^|y1j-3;f6pYCmtniw at C5SK)`W1-5yu!?N+i%e*YwG09l&SQ5a33-pr;eYW5Q3 znmiT-DOcv82i&o|g`JZXrr?f{Sh)2E>C(6D8JoF%(Je-5P9&>N2(BFPKC!Wmh_(&V zLabQ7c%9?pg7&0<@<{;Ig?&vLQ+V*!N1J$md?JRSL&nd$suP0U0*ueE5h4!0O1BZy zBASGx<wQROkeQBNv*{y2Ql at WVfIl6<<|`e6hKG`_pltDgv}Uz2Uc3olvY|jk at hg^& zoq-rM(x2}c-=Tl8PT2BsWCq|<6m}nBe7ksK86zA9&E8ltT...