[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/2] maint: extend xml quoting style to rng files



See the previous patch for rationale.  Done with:

$ find docs -name '*.rng' | \
   xargs sed -i 's/\([a-zA-Z0-9_]*=\)"\([^"]*\)"/\1'\''\2'\''/g'

* cfg.mk (sc_rng_quote_style): Extend the rule.
* docs/schemas/*.rng: Fix fallout.
---

Alas, this diffstat is too big to send to the list uncompressed;
I've trimmed the email to the most important part of the patch.

 cfg.mk                             |    2 +-
 docs/schemas/basictypes.rng        |  128 ++--
 docs/schemas/capability.rng        |   20 +-
 docs/schemas/domain.rng            |    6 +-
 docs/schemas/domaincommon.rng      | 1718 ++++++++++++++++++------------------
 docs/schemas/domainsnapshot.rng    |    6 +-
 docs/schemas/interface.rng         |  272 +++---
 docs/schemas/network.rng           |  114 ++--
 docs/schemas/networkcommon.rng     |   84 +-
 docs/schemas/nodedev.rng           |   42 +-
 docs/schemas/nwfilter.rng          |  936 ++++++++++----------
 docs/schemas/secret.rng            |    4 +-
 docs/schemas/storageencryption.rng |    6 +-
 docs/schemas/storagepool.rng       |   24 +-
 docs/schemas/storagevol.rng        |   22 +-
 15 files changed, 1692 insertions(+), 1692 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index c964c27..30c838b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -422,7 +422,7 @@ sc_TAB_in_indentation:
 # In xml files, prefer name='abc' over name="abc"
 sc_rng_quote_style:
 	@prohibit='\b[-a-zA-Z0-9_]+="'					\
-	in_vc_files='\.(xml)$$'					\
+	in_vc_files='\.(rng|xml)$$'					\
 	halt='use name='\'val\'', not name="val", in xml'		\
 	  $(_sc_search_regexp)

diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index 3b4b952..be29be9 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -1,135 +1,135 @@
-<?xml version="1.0"?>
+<?xml version='1.0'?>
 <!-- network-related definitions used in multiple grammars -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"; datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
+<grammar xmlns='http://relaxng.org/ns/structure/1.0' datatypeLibrary='http://www.w3.org/2001/XMLSchema-datatypes'>

   <!-- Our unsignedInt doesn"t allow a leading "+" in its lexical form -->
-  <define name="unsignedInt">
-    <data type="unsignedInt">
-      <param name="pattern">[0-9]+</param>
+  <define name='unsignedInt'>
+    <data type='unsignedInt'>
+      <param name='pattern'>[0-9]+</param>
     </data>
   </define>
.... [ rest of patch is entirely mechanical, per the instructions
in the commit message ]

-- 
1.7.7.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]