diff options
Diffstat (limited to 'cpp/src/IceGrid/IceGridDB.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridDB.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp index 12b968a18eb..fd4e9ddddc4 100644 --- a/cpp/src/IceGrid/IceGridDB.cpp +++ b/cpp/src/IceGrid/IceGridDB.cpp @@ -82,7 +82,7 @@ Client::run(int argc, char* argv[]) } catch(const IceUtilInternal::BadOptException& e) { - cerr << e.reason << endl; + cerr << argv[0] << ": " << e.reason << endl; usage(); return EXIT_FAILURE; } @@ -107,14 +107,14 @@ Client::run(int argc, char* argv[]) if((!opts.isSet("import") && !opts.isSet("export")) || (opts.isSet("import") && opts.isSet("export"))) { - cerr << "Either --import or --export must be set" << endl; + cerr << argv[0] << ": either --import or --export must be set" << endl; usage(); return EXIT_FAILURE; } if(!opts.isSet("dbhome")) { - cerr << "Database path must be specified" << endl; + cerr << argv[0] << ": database path must be specified" << endl; usage(); return EXIT_FAILURE; } @@ -140,21 +140,21 @@ Client::run(int argc, char* argv[]) if(!IceUtilInternal::directoryExists(dbPath)) { - cerr << "Output directory does not exist: " << dbPath << endl; + cerr << argv[0] << ": output directory does not exist: " << dbPath << endl; return EXIT_FAILURE; } StringSeq files = IcePatch2Internal::readDirectory(dbPath); if(!files.empty()) { - cerr << "Output directory is not empty: " << dbPath << endl; + cerr << argv[0] << ": output directory is not empty: " << dbPath << endl; return EXIT_FAILURE; } ifstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { - cerr << "Could not open input file: " << strerror(errno) << endl; + cerr << argv[0] << ": could not open input file: " << strerror(errno) << endl; return EXIT_FAILURE; } fs.unsetf(ios::skipws); @@ -176,7 +176,7 @@ Client::run(int argc, char* argv[]) stream->read(type); if(type != "IceGrid") { - cerr << "Incorrect input file type: " << type << endl; + cerr << argv[0] << ": incorrect input file type: " << type << endl; return EXIT_FAILURE; } stream->read(version); @@ -369,7 +369,7 @@ Client::run(int argc, char* argv[]) ofstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { - cerr << "Could not open output file: " << strerror(errno) << endl; + cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl; return EXIT_FAILURE; } fs.write(reinterpret_cast<const char*>(buf.first), buf.second - buf.first); @@ -378,7 +378,7 @@ Client::run(int argc, char* argv[]) } catch(const IceUtil::Exception& ex) { - cerr << (import ? "Import" : "Export") << " failed:\n" << ex << endl; + cerr << argv[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl; return EXIT_FAILURE; } |