From cad6f9ae39975d665027d64b772ee0d3ed611bcb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 9 Mar 2012 15:06:26 +0200
Subject: Make sure --sloc-limit works even without --show-sloc

---
 xsd/cxx/parser/generator.cxx | 21 ++++++---------------
 xsd/cxx/tree/generator.cxx   | 29 +++++++++--------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

(limited to 'xsd')

diff --git a/xsd/cxx/parser/generator.cxx b/xsd/cxx/parser/generator.cxx
index 8723940..3635730 100644
--- a/xsd/cxx/parser/generator.cxx
+++ b/xsd/cxx/parser/generator.cxx
@@ -1258,12 +1258,9 @@ namespace CXX
         hxx << "#endif // " << guard << endl;
 
         if (show_sloc)
-        {
-          wcerr << hxx_path << ": "
-                << hxx_sloc.buffer ().count () << endl;
+          wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl;
 
-          sloc += hxx_sloc.buffer ().count ();
-        }
+        sloc += hxx_sloc.buffer ().count ();
       }
 
 
@@ -1321,12 +1318,9 @@ namespace CXX
             << endl;
 
         if (show_sloc)
-        {
-          wcerr << ixx_path << ": "
-                << ixx_sloc.buffer ().count () << endl;
+          wcerr << ixx_path << ": " << ixx_sloc.buffer ().count () << endl;
 
-          sloc += ixx_sloc.buffer ().count ();
-        }
+        sloc += ixx_sloc.buffer ().count ();
       }
 
 
@@ -1393,12 +1387,9 @@ namespace CXX
             << endl;
 
         if (show_sloc)
-        {
-          wcerr << cxx_path << ": "
-                << cxx_sloc.buffer ().count () << endl;
+          wcerr << cxx_path << ": " << cxx_sloc.buffer ().count () << endl;
 
-          sloc += cxx_sloc.buffer ().count ();
-        }
+        sloc += cxx_sloc.buffer ().count ();
       }
 
       // HXX impl
diff --git a/xsd/cxx/tree/generator.cxx b/xsd/cxx/tree/generator.cxx
index 19cdd0e..b408c09 100644
--- a/xsd/cxx/tree/generator.cxx
+++ b/xsd/cxx/tree/generator.cxx
@@ -1351,12 +1351,9 @@ namespace CXX
         fwd << "#endif // " << guard << endl;
 
         if (show_sloc)
-        {
-          wcerr << fwd_path << ": "
-                << fwd_sloc.buffer ().count () << endl;
+          wcerr << fwd_path << ": " << fwd_sloc.buffer ().count () << endl;
 
-          sloc += fwd_sloc.buffer ().count ();
-        }
+        sloc += fwd_sloc.buffer ().count ();
       }
 
       // HXX
@@ -1504,12 +1501,9 @@ namespace CXX
         hxx << "#endif // " << guard << endl;
 
         if (show_sloc)
-        {
-          wcerr << hxx_path << ": "
-                << hxx_sloc.buffer ().count () << endl;
+          wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl;
 
-          sloc += hxx_sloc.buffer ().count ();
-        }
+        sloc += hxx_sloc.buffer ().count ();
       }
 
 
@@ -1580,12 +1574,9 @@ namespace CXX
         ixx << "#endif // " << guard.c_str () << endl;
 
         if (show_sloc)
-        {
-          wcerr << ixx_path << ": "
-                << ixx_sloc.buffer ().count () << endl;
+          wcerr << ixx_path << ": " << ixx_sloc.buffer ().count () << endl;
 
-          sloc += ixx_sloc.buffer ().count ();
-        }
+        sloc += ixx_sloc.buffer ().count ();
       }
 
 
@@ -1732,12 +1723,10 @@ namespace CXX
              << endl;
 
           if (show_sloc)
-          {
-            wcerr << cxx_paths[part] << ": "
-                  << cxx_sloc.buffer ().count () << endl;
+            wcerr << cxx_paths[part] << ": " << cxx_sloc.buffer ().count ()
+                  << endl;
 
-            sloc += cxx_sloc.buffer ().count ();
-          }
+          sloc += cxx_sloc.buffer ().count ();
         }
       }
 
-- 
cgit v1.1