diff options
Diffstat (limited to 'cpp/demo/Freeze/library/RunParser.cpp')
| -rw-r--r-- | cpp/demo/Freeze/library/RunParser.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp index 816753bb4a2..848872382ce 100644 --- a/cpp/demo/Freeze/library/RunParser.cpp +++ b/cpp/demo/Freeze/library/RunParser.cpp @@ -33,21 +33,21 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) bool debug = false; int idx = 1; - while (idx < argc) + while(idx < argc) { - if (strcmp(argv[idx], "-h") == 0 || strcmp(argv[idx], "--help") == 0) + if(strcmp(argv[idx], "-h") == 0 || strcmp(argv[idx], "--help") == 0) { usage(argv[0]); return EXIT_SUCCESS; } - else if (strcmp(argv[idx], "-v") == 0 || strcmp(argv[idx], "--version") == 0) + else if(strcmp(argv[idx], "-v") == 0 || strcmp(argv[idx], "--version") == 0) { cout << ICE_STRING_VERSION << endl; return EXIT_SUCCESS; } - else if (strcmp(argv[idx], "-e") == 0) + else if(strcmp(argv[idx], "-e") == 0) { - if (idx + 1 >= argc) + if(idx + 1 >= argc) { cerr << argv[0] << ": argument expected for`" << argv[idx] << "'" << endl; usage(argv[0]); @@ -57,22 +57,22 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) commands += argv[idx + 1]; commands += ';'; - for (int i = idx ; i + 2 < argc ; ++i) + for(int i = idx ; i + 2 < argc ; ++i) { argv[i] = argv[i + 2]; } argc -= 2; } - else if (strcmp(argv[idx], "-d") == 0 || strcmp(argv[idx], "--debug") == 0) + else if(strcmp(argv[idx], "-d") == 0 || strcmp(argv[idx], "--debug") == 0) { debug = true; - for (int i = idx ; i + 1 < argc ; ++i) + for(int i = idx ; i + 1 < argc ; ++i) { argv[i] = argv[i + 1]; } --argc; } - else if (argv[idx][0] == '-') + else if(argv[idx][0] == '-') { cerr << argv[0] << ": unknown option `" << argv[idx] << "'" << endl; usage(argv[0]); @@ -84,7 +84,7 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } } - if (argc >= 2 && !commands.empty()) + if(argc >= 2 && !commands.empty()) { cerr << argv[0] << ": `-e' option cannot be used if input files are given" << endl; usage(argv[0]); @@ -94,7 +94,7 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) Ice::PropertiesPtr properties = communicator->getProperties(); const char* refProperty = "Library.Library"; string ref = properties->getProperty(refProperty); - if (ref.empty()) + if(ref.empty()) { cerr << argv[0] << ": property `" << refProperty << "' not set" << endl; return EXIT_FAILURE; @@ -102,7 +102,7 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) Ice::ObjectPrx base = communicator->stringToProxy(ref); LibraryPrx phoneBook = LibraryPrx::checkedCast(base); - if (!phoneBook) + if(!phoneBook) { cerr << argv[0] << ": invalid object reference" << endl; return EXIT_FAILURE; @@ -111,12 +111,12 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) ParserPtr parser = Parser::createParser(communicator, phoneBook); int status = EXIT_SUCCESS; - if (argc < 2) // No files given + if(argc < 2) // No files given { - if (!commands.empty()) // Commands were given + if(!commands.empty()) // Commands were given { int parseStatus = parser->parse(commands, debug); - if (parseStatus == EXIT_FAILURE) + if(parseStatus == EXIT_FAILURE) { status = EXIT_FAILURE; } @@ -124,7 +124,7 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) else // No commands, let's use standard input { int parseStatus = parser->parse(stdin, debug); - if (parseStatus == EXIT_FAILURE) + if(parseStatus == EXIT_FAILURE) { status = EXIT_FAILURE; } @@ -132,10 +132,10 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } else // Process files given on the command line { - for (idx = 1 ; idx < argc ; ++idx) + for(idx = 1 ; idx < argc ; ++idx) { FILE* file = fopen(argv[idx], "r"); - if (file == NULL) + if(file == NULL) { cerr << argv[0] << ": can't open file `" << argv[idx] << "': " << strerror(errno) << endl; return EXIT_FAILURE; @@ -145,7 +145,7 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) fclose(file); - if (parseStatus == EXIT_FAILURE) + if(parseStatus == EXIT_FAILURE) { status = EXIT_FAILURE; } |