From nobody Sun Feb 8 19:30:32 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1700562909661492.52127620499766; Tue, 21 Nov 2023 02:35:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8A77718E5; Tue, 21 Nov 2023 05:35:08 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4606517E4; Tue, 21 Nov 2023 05:29:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id EE08117A9; Tue, 21 Nov 2023 05:28:23 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E7E7717A8 for ; Tue, 21 Nov 2023 05:28:22 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-imysIvIqM3-4zoWM8kj0Lw-1; Tue, 21 Nov 2023 05:28:20 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4A2C101A53B for ; Tue, 21 Nov 2023 10:28:20 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50582492BE0 for ; Tue, 21 Nov 2023 10:28:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: imysIvIqM3-4zoWM8kj0Lw-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/6] virXMLParseHelper: Store XML parsing flags in a variable Date: Tue, 21 Nov 2023 11:28:14 +0100 Message-ID: <01f035dee0c486e7c95f923d16d7f3c3e0549be7.1700562423.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: OIP6Q4WRXKWSXD3GNHZBAESA7OC7Y33I X-Message-ID-Hash: OIP6Q4WRXKWSXD3GNHZBAESA7OC7Y33I X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1700562910872100001 The virXMLParseHelper() can work in two modes: either it parses a file or a string. Either way, the same set of flags is specified in call of corresponding function. Save flags in a local variable instead. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/util/virxml.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/util/virxml.c b/src/util/virxml.c index 4f215a0e59..31685cddde 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1136,6 +1136,8 @@ virXMLParseHelper(int domcode, g_autoptr(xmlDoc) xml =3D NULL; xmlNodePtr rootnode; const char *docname; + const int parseFlags =3D XML_PARSE_NONET | + XML_PARSE_NOWARNING; =20 if (filename) docname =3D filename; @@ -1154,13 +1156,9 @@ virXMLParseHelper(int domcode, pctxt->sax->error =3D catchXMLError; =20 if (filename) { - xml =3D xmlCtxtReadFile(pctxt, filename, NULL, - XML_PARSE_NONET | - XML_PARSE_NOWARNING); + xml =3D xmlCtxtReadFile(pctxt, filename, NULL, parseFlags); } else { - xml =3D xmlCtxtReadDoc(pctxt, BAD_CAST xmlStr, url, NULL, - XML_PARSE_NONET | - XML_PARSE_NOWARNING); + xml =3D xmlCtxtReadDoc(pctxt, BAD_CAST xmlStr, url, NULL, parseFla= gs); } =20 if (!xml) { --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org