Re: [libvirt] [PATCH 2/2] conf: Use virStringParseYesNo()

This commit remove redundant common pattern in our XML parsing that convert string 'yes' into true and 'no' into false, and error if we receive anything other values. Signed-off-by: Shotaro Gotanda <g.sho1500(a)gmail.com&gt; --- src/conf/domain_conf.c | 30 +++++------------------------- src/conf/secret_conf.c | 12 ++---------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 995f87bcbe..3830926f3d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8412,11 +8412,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, p = virXMLPropStringLimit(ctxt->node, "relabel", VIR_SECURITY_LABEL_BUFLEN-1); if (p) { - if (STREQ(p, "yes")) { - seclabel->relabel = true; - } else if (STREQ(p, "no")) { - seclabel->relabel = false; - } else { + if (virStringParseYesNo(p, &seclabel->relabel) < 0) {

virReportError(VIR_ERR_XML_ERROR, _("invalid security relabel value %s"), p); goto error;