Correct invalid RNG schemas

The 'trang' utility, which is able to transform '.rng' files into
'.rnc' files, reported some errors in our schemas that weren't caught
by the tools we use in the build.  I haven't added a test for this,
but the validity can be checked by the following command:

trang -I rng -O rnc domain.rng domain.rnc

There were unescaped minuses in regular expressions and we were
constraining int (which is by default in the range of [-2^31;2^31-1]
to maximum of 2^32.  But what we wanted was exactly an unsignedInt.

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index c4e7b7abb0f29d5fa21654a902dd9148fb3a36d9..3240e1cd8cd94f553c333990bf880d5dc126414d 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3929,7 +3929,7 @@
   </define>
   <define name='aliasName'>
     <data type="string">
-      <param name="pattern">[a-zA-Z0-9_-]+</param>
+      <param name="pattern">[a-zA-Z0-9_\-]+</param>
     </data>
   </define>
   <define name='alias'>

diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
index cfd9ba57c77cf10bd965f3266b9dc638f1d769c4..f1aa699c7e9f81fb6b155bd8c7418bc63b83de0b 100644 (file)
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -308,25 +308,25 @@
         <choice>
           <value>root</value>
           <data type="string">
-            <param name="pattern">mac[a-zA-Z0-9_\.:-]{0,9}</param>
+            <param name="pattern">mac[a-zA-Z0-9_\.:\-]{0,9}</param>
           </data>
           <data type="string">
-            <param name="pattern">stp[a-zA-Z0-9_\.:-]{0,9}</param>
+            <param name="pattern">stp[a-zA-Z0-9_\.:\-]{0,9}</param>
           </data>
           <data type="string">
-            <param name="pattern">vlan[a-zA-Z0-9_\.:-]{0,8}</param>
+            <param name="pattern">vlan[a-zA-Z0-9_\.:\-]{0,8}</param>
           </data>
           <data type="string">
-            <param name="pattern">arp[a-zA-Z0-9_\.:-]{0,9}</param>
+            <param name="pattern">arp[a-zA-Z0-9_\.:\-]{0,9}</param>
           </data>
           <data type="string">
-            <param name="pattern">rarp[a-zA-Z0-9_\.:-]{0,8}</param>
+            <param name="pattern">rarp[a-zA-Z0-9_\.:\-]{0,8}</param>
           </data>
           <data type="string">
-            <param name="pattern">ipv4[a-zA-Z0-9_\.:-]{0,8}</param>
+            <param name="pattern">ipv4[a-zA-Z0-9_\.:\-]{0,8}</param>
           </data>
           <data type="string">
-            <param name="pattern">ipv6[a-zA-Z0-9_\.:-]{0,8}</param>
+            <param name="pattern">ipv6[a-zA-Z0-9_\.:\-]{0,8}</param>
           </data>
         </choice>
       </attribute>
@@ -950,10 +950,7 @@
         <param name="pattern">0x[0-9a-fA-F]{1,8}</param>
       </data>
 
-      <data type="int">
-        <param name="minInclusive">0</param>
-        <param name="maxInclusive">4294967295</param>
-      </data>
+      <data type="unsignedInt"/>
     </choice>
   </define>