summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/slice2cpp/Main.cpp20
-rw-r--r--cpp/src/slice2cs/Main.cpp20
-rw-r--r--cpp/src/slice2freeze/Main.cpp20
-rw-r--r--cpp/src/slice2freezej/Main.cpp20
-rw-r--r--cpp/src/slice2html/Main.cpp20
-rw-r--r--cpp/src/slice2java/Main.cpp20
-rw-r--r--cpp/src/slice2php/Main.cpp47
-rw-r--r--cpp/src/slice2py/Main.cpp20
-rw-r--r--cpp/src/slice2rb/Main.cpp20
9 files changed, 122 insertions, 85 deletions
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index c7c56614ae4..b1817d5c7a9 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -56,8 +56,8 @@ interruptedCallback(int signal)
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -114,7 +114,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": " << e.reason << endl;
+ getErrorStream() << argv[0] << ": " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -127,7 +127,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -306,30 +306,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index bbe3de14cab..2941e5ba63c 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -56,8 +56,8 @@ interruptedCallback(int signal)
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -108,7 +108,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -121,7 +121,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -315,30 +315,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 37e556d21a1..a49cbe64a4b 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -192,8 +192,8 @@ struct IndexType
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] file-base [slice-files...]\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] file-base [slice-files...]\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -1532,7 +1532,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -1545,7 +1545,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -2057,30 +2057,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 18c9f7ec68c..32a8ee1057c 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -1216,8 +1216,8 @@ FreezeGenerator::generate(UnitPtr& u, const Index& index)
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] [slice-files...]\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] [slice-files...]\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -1284,7 +1284,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -1297,7 +1297,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -1735,30 +1735,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index 119aadcb782..a02a532f780 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -58,8 +58,8 @@ interruptedCallback(int signal)
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -116,7 +116,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -129,7 +129,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -316,30 +316,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 9eb5cc6e1fc..2c9a44da489 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -60,8 +60,8 @@ interruptedCallback(int signal)
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -118,7 +118,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -131,7 +131,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -400,30 +400,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 0f5e0af5d87..6c664c5b576 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1485,8 +1485,8 @@ interruptedCallback(int signal)
static void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -1505,7 +1505,7 @@ usage(const char* n)
}
int
-main(int argc, char* argv[])
+compile(int argc, char* argv[])
{
IceUtilInternal::Options opts;
opts.addOpt("h", "help");
@@ -1531,7 +1531,7 @@ main(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -1544,7 +1544,7 @@ main(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -1707,3 +1707,40 @@ main(int argc, char* argv[])
return status;
}
+int
+main(int argc, char* argv[])
+{
+ try
+ {
+ return compile(argc, argv);
+ }
+ catch(const IceUtil::Exception& ex)
+ {
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
+#ifdef __GNUC__
+ getErrorStream() << ex.ice_stackTrace() << endl;
+#endif
+ return EXIT_FAILURE;
+ }
+ catch(const std::exception& ex)
+ {
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
+ return EXIT_FAILURE;
+ }
+ catch(const std::string& msg)
+ {
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
+ return EXIT_FAILURE;
+ }
+ catch(const char* msg)
+ {
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
+ return EXIT_FAILURE;
+ }
+ catch(...)
+ {
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
+ return EXIT_FAILURE;
+ }
+}
+
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index 9689c27692a..8cde80b8a07 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -385,8 +385,8 @@ PackageVisitor::writeInit(const string& dir, const StringList& modules, const St
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -433,7 +433,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -446,7 +446,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -634,30 +634,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index fd14876f72e..6417c7523cf 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -73,8 +73,8 @@ interruptedCallback(int signal)
void
usage(const char* n)
{
- cerr << "Usage: " << n << " [options] slice-files...\n";
- cerr <<
+ getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -117,7 +117,7 @@ compile(int argc, char* argv[])
}
catch(const IceUtilInternal::BadOptException& e)
{
- cerr << argv[0] << ": error: " << e.reason << endl;
+ getErrorStream() << argv[0] << ": error: " << e.reason << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
@@ -130,7 +130,7 @@ compile(int argc, char* argv[])
if(opts.isSet("version"))
{
- cerr << ICE_STRING_VERSION << endl;
+ getErrorStream() << ICE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
@@ -293,30 +293,30 @@ main(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
#ifdef __GNUC__
- cerr << ex.ice_stackTrace() << endl;
+ getErrorStream() << ex.ice_stackTrace() << endl;
#endif
return EXIT_FAILURE;
}
catch(const std::exception& ex)
{
- cerr << ex.what() << endl;
+ getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
return EXIT_FAILURE;
}
catch(const std::string& msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(const char* msg)
{
- cerr << msg << endl;
+ getErrorStream() << argv[0] << ": error:" << msg << endl;
return EXIT_FAILURE;
}
catch(...)
{
- cerr << "unknown exception" << endl;
+ getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
return EXIT_FAILURE;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 10:48:18 +0000