[libvirt] [PATCH 1/4] remote: dispatch: Remove return value from make_nonnull_* helpers

Eric Blake eblake at redhat.com
Wed Oct 23 03:10:39 UTC 2019


On 10/22/19 9:45 AM, Peter Krempa wrote:
> After convertion to g_strdup, the helpers now always return success.

conversion

> Remove the return value to simplify the callers.
> 
> Note that many occurences of these is in the code generated by

occurrences

> gendispatch.pl. Since gendispatch aggregates many cases together a

an

> incremental conversion would require more invasive changes to
> gendispatch for the time of coversion which doesn't make sense.

conversion

> 
> Also in many cases the helper was the last place where the 'error:'
> label was used and thus also those conversions must be included in this
> patch.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>   src/admin/admin_server_dispatch.c   |   6 +-
>   src/remote/remote_daemon_dispatch.c | 321 ++++++----------------------
>   src/rpc/gendispatch.pl              |  19 +-
>   3 files changed, 75 insertions(+), 271 deletions(-)
> 

Lots of changes, but I agree it can't really be nicely split further.

ACK.


> +++ b/src/remote/remote_daemon_dispatch.c
> @@ -95,18 +95,18 @@ static virNWFilterBindingPtr get_nonnull_nwfilter_binding(virConnectPtr conn, re
>   static virDomainCheckpointPtr get_nonnull_domain_checkpoint(virDomainPtr dom, remote_nonnull_domain_checkpoint checkpoint);
>   static virDomainSnapshotPtr get_nonnull_domain_snapshot(virDomainPtr dom, remote_nonnull_domain_snapshot snapshot);
>   static virNodeDevicePtr get_nonnull_node_device(virConnectPtr conn, remote_nonnull_node_device dev);
> -static int make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPtr dom_src) G_GNUC_WARN_UNUSED_RESULT;
> -static int make_nonnull_network(remote_nonnull_network *net_dst, virNetworkPtr net_src) G_GNUC_WARN_UNUSED_RESULT;

> +static void make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPtr dom_src);
> +static void make_nonnull_network(remote_nonnull_network *net_dst, virNetworkPtr net_src);

Pre-existing, but should we wrap these long lines?

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org




More information about the libvir-list mailing list