From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 6 Jan 2021 10:27:50 +0000 (+0100)
Subject: schema: Remove workaround for bug in libxml2 2.7.6
X-Git-Tag: v7.0.0-rc1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9551061955be0d9b041968585df8db589a0cb69;p=thirdparty%2Flibvirt.git

schema: Remove workaround for bug in libxml2 2.7.6

New libxml2 handles '\n' properly so the literal newline is not
necessary, because 2.9.1 is the minimum version we support.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index bcbaee9db8..39bed92115 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -19,9 +19,7 @@
   <define name="title">
     <element name="title">
       <data type="string">
-        <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-        <param name="pattern">[^
-]+</param>
+        <param name="pattern">[^\n]+</param>
       </data>
     </element>
   </define>
@@ -6948,9 +6946,7 @@
   </define>
   <define name="domainName">
     <data type="string">
-      <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-      <param name="pattern">[^
-]+</param>
+      <param name="pattern">[^\n]+</param>
     </data>
   </define>
   <define name="diskSerial">
diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index 6597ebc824..54619d4cb0 100644
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -8,9 +8,7 @@
 
   <define name="poolName">
     <data type="string">
-      <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-      <param name="pattern">[^/
-]+</param>
+      <param name="pattern">[^/\n]+</param>
     </data>
   </define>