[Libguestfs] [PATCH] Fully initialize the custom_operations structs
Richard W.M. Jones
rjones at redhat.com
Mon Oct 9 11:54:02 UTC 2017
On Mon, Oct 09, 2017 at 12:56:48PM +0200, Pino Toscano wrote:
> Use also custom_compare_ext_default for the compare_ext field.
>
> According to the git logs, this was introduced in OCaml 3.12.1, which is
> earlier than out minimum required version.
>
> mlaugeas is not touched by this change, since it is a copy of a 3rd
> party library (and thus it will be fixed there first).
> ---
> common/mlpcre/pcre-c.c | 3 ++-
> common/mlprogress/progress-c.c | 3 ++-
> common/mlxml/xml-c.c | 9 ++++++---
> ocaml/guestfs-c.c | 3 ++-
> v2v/qemuopts-c.c | 3 ++-
> 5 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c
> index 61af616be..da982025f 100644
> --- a/common/mlpcre/pcre-c.c
> +++ b/common/mlpcre/pcre-c.c
> @@ -97,7 +97,8 @@ static struct custom_operations custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> static value
> diff --git a/common/mlprogress/progress-c.c b/common/mlprogress/progress-c.c
> index ac6bbfa31..f4a83fd77 100644
> --- a/common/mlprogress/progress-c.c
> +++ b/common/mlprogress/progress-c.c
> @@ -52,7 +52,8 @@ static struct custom_operations progress_bar_custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> value
> diff --git a/common/mlxml/xml-c.c b/common/mlxml/xml-c.c
> index 92388d940..45475f8f7 100644
> --- a/common/mlxml/xml-c.c
> +++ b/common/mlxml/xml-c.c
> @@ -49,7 +49,8 @@ static struct custom_operations docptr_custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> value
> @@ -71,7 +72,8 @@ static struct custom_operations xpathctxptr_custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> value
> @@ -93,7 +95,8 @@ static struct custom_operations xpathobjptr_custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> value
> diff --git a/ocaml/guestfs-c.c b/ocaml/guestfs-c.c
> index d4ada3165..925f6188c 100644
> --- a/ocaml/guestfs-c.c
> +++ b/ocaml/guestfs-c.c
> @@ -96,7 +96,8 @@ static struct custom_operations guestfs_custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> static value
> diff --git a/v2v/qemuopts-c.c b/v2v/qemuopts-c.c
> index 40b23f956..0f076d77d 100644
> --- a/v2v/qemuopts-c.c
> +++ b/v2v/qemuopts-c.c
> @@ -51,7 +51,8 @@ static struct custom_operations qemuopts_custom_operations = {
> custom_compare_default,
> custom_hash_default,
> custom_serialize_default,
> - custom_deserialize_default
> + custom_deserialize_default,
> + custom_compare_ext_default,
> };
>
> value
> --
> 2.13.6
ACK.
Thanks,
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
More information about the Libguestfs
mailing list