[libvirt] [PATCH 2/3] conf/network_conf: use virStringParseYesNo helper

[Michal Privoznik]

On 10/16/19 4:39 AM, Mao Zhongyi wrote:
> A function virStringParseYesNo was added to convert
> string 'yes' to true and 'no' to false, so use this
> helper to replace 'STREQ(.*, \"yes\")' and
> 'STREQ(.*, \"no\")' as it allows us to drop several
> repetitive if-then-else string->bool conversion blocks.
> 
> Cc: gene at czarc.net
> Cc: crobinso at redhat.com
> Cc: berrange at redhat.com
> Cc: g.sho1500 at gmail.com
> 
> Signed-off-by: Mao Zhongyi <maozhongyi at cmss.chinamobile.com>
> Signed-off-by: Zhang Shengju <zhangshengju at cmss.chinamobile.com>
> ---
>   src/conf/network_conf.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
> index 75ec5ccc27..9954c3d25f 100644
> --- a/src/conf/network_conf.c
> +++ b/src/conf/network_conf.c
> @@ -1682,9 +1682,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
>        */
>       ipv6nogwStr = virXPathString("string(./@ipv6)", ctxt);
>       if (ipv6nogwStr) {
> -        if (STREQ(ipv6nogwStr, "yes")) {
> -            def->ipv6nogw = true;
> -        } else if (STRNEQ(ipv6nogwStr, "no")) {
> +        if (virStringParseYesNo(ipv6nogwStr, &def->ipv6nogw) < 0) {
>               virReportError(VIR_ERR_XML_ERROR,
>                              _("Invalid ipv6 setting '%s' in network '%s'"),
>                              ipv6nogwStr, def->name);
> 

ACK

Michal