Whitespace cleanup (#1696)

zeroc-ice · Jan 19, 2024 · 3e8804a · 3e8804a
1 parent 695a383
commit 3e8804a
Show file tree

Hide file tree

Showing 107 changed files with 46 additions and 285 deletions.
diff --git a/cpp/include/IceBox/Service.h b/cpp/include/IceBox/Service.h
@@ -177,7 +177,6 @@ using ServicePtr = ::std::shared_ptr<Service>;
 
 #else // C++98 mapping
 
-
 namespace IceBox
 {
 

diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
@@ -122,13 +122,11 @@ typedef std::shared_ptr<Patcher> PatcherPtr;
 typedef IceUtil::Handle<Patcher> PatcherPtr;
 #endif // ICE_CPP11_MAPPING
 
-
-
 //
 // IcePatch2 clients instantiate the IcePatch2::Patcher class
 // using the patcher factory.
 //
-class ICEPATCH2_API PatcherFactory 
+class ICEPATCH2_API PatcherFactory
 #ifndef ICE_CPP11_MAPPING
     : public IceUtil::noncopyable
 #endif // !ICE_CPP11_MAPPING

diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
@@ -37,7 +37,6 @@
 #   pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
-
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wunused-function"
 #  pragma GCC diagnostic ignored "-Wimplicit-fallthrough"

diff --git a/cpp/src/Glacier2/Instrumentation.h b/cpp/src/Glacier2/Instrumentation.h
@@ -46,7 +46,6 @@
 namespace Glacier2
 {
 
-
 namespace Instrumentation
 {
 

diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
@@ -331,4 +331,3 @@ IceGrid::secondsToInt(const std::chrono::seconds& sec)
 {
     return chrono::duration_cast<chrono::duration<int>>(sec).count();
 }
-
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
@@ -82,7 +82,7 @@ IcePatch2Internal::writeFileInfo(FILE* fp, const LargeFileInfo& info)
         "%s\t%s\t" ICE_INT64_FORMAT "\t%d\n",
 #endif
         IceUtilInternal::escapeString(
-            info.path, "", 
+            info.path, "",
 #ifdef ICE_CPP11_MAPPING
             IceUtilInternal::ToStringMode::Compat
 #else

diff --git a/cpp/src/IceStorm/Instrumentation.h b/cpp/src/IceStorm/Instrumentation.h
@@ -53,7 +53,6 @@
 namespace IceStorm
 {
 
-
 namespace Instrumentation
 {
 

diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
@@ -1131,7 +1131,7 @@ Slice::Container::createClassDef(const string& name, int id, const ClassDefPtr&
             if(differsOnlyInCase)
             {
                 ostringstream os;
-                os << "class definition `" << name << "' is capitalized inconsistently with its previous name: `" 
+                os << "class definition `" << name << "' is capitalized inconsistently with its previous name: `"
                    << def->name() << "'";
                 _unit->error(os.str());
             }
@@ -2563,7 +2563,7 @@ Slice::Container::checkIntroduced(const string& scoped, ContainedPtr namedThing)
             }
 
             _unit->error("`" + firstComponent + "' has changed meaning");
-            
+
             return false;
         }
     }
@@ -4944,7 +4944,7 @@ ParamDeclList
 Slice::Operation::outParameters() const
 {
     ParamDeclList result;
-    
+
     for(const auto& p : _contents)
     {
         ParamDeclPtr q = dynamic_pointer_cast<ParamDecl>(p);

diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h
@@ -44,8 +44,6 @@ class Preprocessor
 
 private:
 
-
-
     bool checkInputFile();
 
     const std::string _path;

diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
@@ -57,7 +57,6 @@ getAbsolute(const ContainedPtr& cont, const string& pfx = std::string(), const s
 
 }
 
-
 // CodeVisitor generates the PHP mapping for a translation unit.
 class CodeVisitor : public ParserVisitor
 {

diff --git a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
@@ -33,4 +33,4 @@ class Server : public Test::TestHelper
     }
 };
 
-DEFINE_TEST(Server)
+DEFINE_TEST(Server)
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
@@ -312,7 +312,6 @@ class NodeObserverI final : public NodeObserver, public ObserverBase
             return;
         }
 
-
         lock_guard<mutex> lg(_mutex);
         //cerr << node << " " << info.id << " " << info.state << " " << info.pid << endl;
         ServerDynamicInfoSeq& servers = nodes[node].servers;

diff --git a/cpp/test/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp
@@ -14,7 +14,6 @@ class ClientPermissionsVerifierI final : public Glacier2::PermissionsVerifier
 {
 public:
 
-
     bool
     checkPermissions(string userId, string passwd, string&, const Ice::Current& current) const override
     {

diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
@@ -1226,7 +1226,7 @@ allTests(Test::TestHelper* helper)
             try
             {
                 test(
-                    admin->getServerInfo("Server").node == "node-2" && 
+                    admin->getServerInfo("Server").node == "node-2" &&
                     admin->getServerState("Server") == ServerState::Inactive);
 
                 admin->startServer("Server");

diff --git a/cpp/test/IceSSL/certs/ca.crl.pem b/cpp/test/IceSSL/certs/ca.crl.pem
@@ -28,4 +28,3 @@ cuRYxC04NmEeAaLDoNDYaFQUcc1Y80XqXhEdQhLAjZX45m26zcTHNgnuzIFWl+IH
 Hdc+qc3B379K7phWfugzXEk+IT0V58tUQjly1TzcltC5UhS2OMRs5eWgTKki3hnt
 +Vqf5naZDZdjMB8nbcl2Qh6NmUz0oxNC3g1L4Bex7/qAaiA=
 -----END X509 CRL-----
-
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"}
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"}
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca.settings.json b/cpp/test/IceSSL/certs/db/ca2/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
diff --git a/cpp/test/IceSSL/certs/db/ca3/ca.settings.json b/cpp/test/IceSSL/certs/db/ca3/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/ca3.crl.pem"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/ca3.crl.pem"}
diff --git a/cpp/test/IceSSL/certs/db/ca3/crlnumber.old b/cpp/test/IceSSL/certs/db/ca3/crlnumber.old
@@ -1 +1 @@
-00
+00
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/cai3.crl.pem"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/cai3.crl.pem"}
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old b/cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old
@@ -1 +1 @@
-00
+00
diff --git a/cpp/test/IceSSL/certs/db/ca4/ca.settings.json b/cpp/test/IceSSL/certs/db/ca4/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cacert4.der"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cacert4.der"}
diff --git a/cpp/test/IceSSL/certs/db/ca4/crlnumber.old b/cpp/test/IceSSL/certs/db/ca4/crlnumber.old
@@ -1 +1 @@
-00
+00
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cai4.der"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cai4.der"}
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old b/cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old
@@ -1 +1 @@
-00
+00
Original file line number	Diff line number	Diff line change
Expand Up		@@ -177,7 +177,6 @@ using ServicePtr = ::std::shared_ptr<Service>;

		#else // C++98 mapping


		namespace IceBox
		{

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,6 @@ @@
     namespace Glacier2
     {
     namespace Instrumentation
     {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -331,4 +331,3 @@ IceGrid::secondsToInt(const std::chrono::seconds& sec)
		{
		return chrono::duration_cast<chrono::duration<int>>(sec).count();
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,8 +44,6 @@ class Preprocessor

		private:



		bool checkInputFile();

		const std::string _path;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@ cuRYxC04NmEeAaLDoNDYaFQUcc1Y80XqXhEdQhLAjZX45m26zcTHNgnuzIFWl+IH
		Hdc+qc3B379K7phWfugzXEk+IT0V58tUQjly1TzcltC5UhS2OMRs5eWgTKki3hnt
		+Vqf5naZDZdjMB8nbcl2Qh6NmUz0oxNC3g1L4Bex7/qAaiA=
		-----END X509 CRL-----
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
		{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}