Eliminate catch(const char*) #48

14 files changed, 5 insertions, 154 deletions

diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 9c36fdc6c7c..838c49cd0ff 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -273,16 +273,6 @@ Client::main(StringSeq& args)
         consoleErr << _appName << ": std::exception: " << ex.what() << endl;
         status = EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << _appName << ": " << msg << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << _appName << ": " << msg << endl;
-        status = EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << _appName << ": unknown exception" << endl;
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 142f1a72135..83c1d89ac9f 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -730,18 +730,6 @@ ApplicationObserverTopic::applicationUpdated(Ice::Long dbSerial, const Applicati
         out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << ex.what();
         assert(false);
     }
-    catch(const std::string& msg)
-    {
-        Ice::Error out(_logger);
-        out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << msg;
-        assert(false);
-    }
-    catch(const char* msg)
-    {
-        Ice::Error out(_logger);
-        out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << msg;
-        assert(false);
-    }
     catch(...)
     {
         Ice::Error out(_logger);
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 42b4792c4aa..aaa82e2ca6a 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -315,11 +315,6 @@ main(int argc, char* argv[])
         consoleErr << appName << ": " << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const char* ex)
-    {
-        consoleErr << appName << ": " << ex << endl;
-        return EXIT_FAILURE;
-    }
 
     return EXIT_SUCCESS;
 }
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index c9ac0284637..0e6b6c21e56 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -329,16 +329,10 @@ compile(const vector<string>& argv)
             consoleErr << argv[0] << ": error: " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
-        catch(const string& err)
+        catch(...)
         {
             FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
-            status = EXIT_FAILURE;
-        }
-        catch(const char* err)
-        {
-            FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
+            consoleErr << args[0] << ": error:" << "unknown exception" << endl;
             status = EXIT_FAILURE;
         }
     }
@@ -374,16 +368,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index c4199125f3a..780925df2c7 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -398,16 +398,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index 7b574760ac9..fc965cc529b 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -379,16 +379,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index 9b7dd0cbf2a..ec74420b7f3 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -300,17 +300,11 @@ compile(const vector<string>& argv)
             consoleErr << argv[0] << ": error: " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
-        catch(const string& err)
+        catch(...)
         {
             FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
-            status = EXIT_FAILURE;
-        }
-        catch(const char* err)
-        {
-            FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
-            status = EXIT_FAILURE;
+            consoleErr << args[0] << ": error:" << "unknown exception" << endl;
+            return EXIT_FAILURE;
         }
     }
 
@@ -345,16 +339,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 41221c40b19..207b24d1e35 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -464,16 +464,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 4be495cb62c..46cf1671d48 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -405,16 +405,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp
index 48584689693..e2ed4c7a072 100644
--- a/cpp/src/slice2matlab/Main.cpp
+++ b/cpp/src/slice2matlab/Main.cpp
@@ -5014,16 +5014,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp
index 5b0c1422495..c0f09d940ee 100644
--- a/cpp/src/slice2objc/Main.cpp
+++ b/cpp/src/slice2objc/Main.cpp
@@ -348,16 +348,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 10c3bbc8b2f..780da8f8f29 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1935,16 +1935,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index 0f2c3ab3f5e..d470f603606 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -32,16 +32,6 @@ int main(int argc, char* argv[])
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index c827a8904aa..1e78dd02c2d 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -32,16 +32,6 @@ int main(int argc, char* argv[])
         consoleErr << argv[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << argv[0] << ": error:" << "unknown exception" << endl;