From nobody Thu May 15 16:40:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1503588152100423.31159191739187; Thu, 24 Aug 2017 08:22:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 589628B134; Thu, 24 Aug 2017 15:22:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 388C27F8D7; Thu, 24 Aug 2017 15:22:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 023EF3FA58; Thu, 24 Aug 2017 15:22:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7OFMShv014784 for ; Thu, 24 Aug 2017 11:22:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0BD6B7009C; Thu, 24 Aug 2017 15:22:28 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86FE07F474 for ; Thu, 24 Aug 2017 15:22:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 589628B134 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Aug 2017 17:22:07 +0200 Message-Id: <0c0632fbcd54c71c0a947bfec03be7085ca93ff2.1503588082.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] util: introduce virXMLFormatElement helper X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 24 Aug 2017 15:22:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This helper allows you to better structurize the code if some element may or may not contains attributes and/or child elements. Signed-off-by: Pavel Hrdina --- src/libvirt_private.syms | 1 + src/util/virxml.c | 47 ++++++++++++++++++++++++++++++++++++++++++++= +++ src/util/virxml.h | 6 ++++++ 3 files changed, 54 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2149b11b74..12adf27285 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2955,6 +2955,7 @@ virVHBAPathExists; virXMLCheckIllegalChars; virXMLChildElementCount; virXMLExtractNamespaceXML; +virXMLFormatElement; virXMLNodeContentString; virXMLNodeNameEqual; virXMLNodeSanitizeNamespaces; diff --git a/src/util/virxml.c b/src/util/virxml.c index 562a4bf3ba..885f59bceb 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1354,3 +1354,50 @@ virXMLValidatorFree(virXMLValidatorPtr validator) xmlRelaxNGFree(validator->rng); VIR_FREE(validator); } + + +/** + * virXMLFormatElement + * @buf: the parent buffer where the element will be placed + * @name: the name of the element + * @attrBuf: buffer with attributes for element, may be NULL + * @childBuf: buffer with child elements, may be NULL + * + * Helper to format element where attributes or child elements + * are optional and may not be formatted. If both @attrBuf and + * @childBuf are NULL or are empty buffers the element is not + * formatted. + * + * Returns 0 on success, -1 on error. + */ +int +virXMLFormatElement(virBufferPtr buf, + const char *name, + virBufferPtr attrBuf, + virBufferPtr childBuf) +{ + if ((!attrBuf || virBufferUse(attrBuf) =3D=3D 0) && + (!childBuf || virBufferUse(childBuf) =3D=3D 0)) { + return 0; + } + + if ((attrBuf && virBufferCheckError(attrBuf) < 0) || + (childBuf && virBufferCheckError(childBuf) < 0)) { + return -1; + } + + virBufferAsprintf(buf, "<%s", name); + + if (attrBuf && virBufferUse(attrBuf) > 0) + virBufferAddBuffer(buf, attrBuf); + + if (childBuf && virBufferUse(childBuf) > 0) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, childBuf); + virBufferAsprintf(buf, "\n", name); + } else { + virBufferAddLit(buf, "/>\n"); + } + + return 0; +} diff --git a/src/util/virxml.h b/src/util/virxml.h index 86baeb37a7..1a7d61a8bc 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -215,4 +215,10 @@ virXMLValidateAgainstSchema(const char *schemafile, void virXMLValidatorFree(virXMLValidatorPtr validator); =20 +int +virXMLFormatElement(virBufferPtr buf, + const char *name, + virBufferPtr attrBuf, + virBufferPtr childBuf); + #endif /* __VIR_XML_H__ */ --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list