From 6c49a8986834ee9ed9e20884709ce5a67a20654b Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 12 May 2016 11:35:24 +0200 Subject: [PATCH] Let ParseAll exit if unsuccessfull --- examples/MQ/1-sampler-sink/runExample1Sampler.cxx | 5 +---- examples/MQ/1-sampler-sink/runExample1Sink.cxx | 5 +---- .../MQ/2-sampler-processor-sink/runExample2Processor.cxx | 5 +---- examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx | 5 +---- examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx | 5 +---- examples/MQ/3-dds/runExample3Processor.cxx | 5 +---- examples/MQ/3-dds/runExample3Sampler.cxx | 5 +---- examples/MQ/3-dds/runExample3Sink.cxx | 5 +---- examples/MQ/4-copypush/runExample4Sampler.cxx | 5 +---- examples/MQ/4-copypush/runExample4Sink.cxx | 5 +---- examples/MQ/5-req-rep/runExample5Client.cxx | 6 +----- examples/MQ/5-req-rep/runExample5Server.cxx | 5 +---- examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx | 5 +---- examples/MQ/6-multiple-channels/runExample6Sampler.cxx | 5 +---- examples/MQ/6-multiple-channels/runExample6Sink.cxx | 5 +---- examples/MQ/8-multipart/runExample8Sampler.cxx | 5 +---- examples/MQ/8-multipart/runExample8Sink.cxx | 5 +---- 17 files changed, 17 insertions(+), 69 deletions(-) diff --git a/examples/MQ/1-sampler-sink/runExample1Sampler.cxx b/examples/MQ/1-sampler-sink/runExample1Sampler.cxx index 840dcbbf..7f83e569 100644 --- a/examples/MQ/1-sampler-sink/runExample1Sampler.cxx +++ b/examples/MQ/1-sampler-sink/runExample1Sampler.cxx @@ -32,10 +32,7 @@ int main(int argc, char** argv) FairMQProgOptions config; config.AddToCmdLineOptions(samplerOptions); - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample1Sampler sampler; sampler.CatchSignals(); diff --git a/examples/MQ/1-sampler-sink/runExample1Sink.cxx b/examples/MQ/1-sampler-sink/runExample1Sink.cxx index da216287..a9403d0a 100644 --- a/examples/MQ/1-sampler-sink/runExample1Sink.cxx +++ b/examples/MQ/1-sampler-sink/runExample1Sink.cxx @@ -23,10 +23,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample1Sink sink; sink.CatchSignals(); diff --git a/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx b/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx index 8afeb243..37937bed 100644 --- a/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx +++ b/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx @@ -22,10 +22,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample2Processor processor; processor.CatchSignals(); diff --git a/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx b/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx index 441fe5ab..58676066 100644 --- a/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx +++ b/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx @@ -33,10 +33,7 @@ int main(int argc, char** argv) FairMQProgOptions config; config.AddToCmdLineOptions(samplerOptions); - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample2Sampler sampler; sampler.CatchSignals(); diff --git a/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx b/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx index 63a3994c..69d9eaaa 100644 --- a/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx +++ b/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx @@ -22,10 +22,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample2Sink sink; sink.CatchSignals(); diff --git a/examples/MQ/3-dds/runExample3Processor.cxx b/examples/MQ/3-dds/runExample3Processor.cxx index 68089fb4..406d711f 100644 --- a/examples/MQ/3-dds/runExample3Processor.cxx +++ b/examples/MQ/3-dds/runExample3Processor.cxx @@ -22,10 +22,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample3Processor processor; processor.CatchSignals(); diff --git a/examples/MQ/3-dds/runExample3Sampler.cxx b/examples/MQ/3-dds/runExample3Sampler.cxx index 5cc38d12..337526a4 100644 --- a/examples/MQ/3-dds/runExample3Sampler.cxx +++ b/examples/MQ/3-dds/runExample3Sampler.cxx @@ -22,10 +22,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample3Sampler sampler; sampler.CatchSignals(); diff --git a/examples/MQ/3-dds/runExample3Sink.cxx b/examples/MQ/3-dds/runExample3Sink.cxx index 823721a4..c1793a29 100644 --- a/examples/MQ/3-dds/runExample3Sink.cxx +++ b/examples/MQ/3-dds/runExample3Sink.cxx @@ -22,10 +22,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample3Sink sink; sink.CatchSignals(); diff --git a/examples/MQ/4-copypush/runExample4Sampler.cxx b/examples/MQ/4-copypush/runExample4Sampler.cxx index cd1230ba..339b499b 100644 --- a/examples/MQ/4-copypush/runExample4Sampler.cxx +++ b/examples/MQ/4-copypush/runExample4Sampler.cxx @@ -23,10 +23,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample4Sampler sampler; sampler.CatchSignals(); diff --git a/examples/MQ/4-copypush/runExample4Sink.cxx b/examples/MQ/4-copypush/runExample4Sink.cxx index 0959afd2..0b048d7f 100644 --- a/examples/MQ/4-copypush/runExample4Sink.cxx +++ b/examples/MQ/4-copypush/runExample4Sink.cxx @@ -23,10 +23,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample4Sink sink; sink.CatchSignals(); diff --git a/examples/MQ/5-req-rep/runExample5Client.cxx b/examples/MQ/5-req-rep/runExample5Client.cxx index e5e48a6d..c9a9a129 100644 --- a/examples/MQ/5-req-rep/runExample5Client.cxx +++ b/examples/MQ/5-req-rep/runExample5Client.cxx @@ -32,11 +32,7 @@ int main(int argc, char** argv) FairMQProgOptions config; config.AddToCmdLineOptions(clientOptions); - - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample5Client client; client.CatchSignals(); diff --git a/examples/MQ/5-req-rep/runExample5Server.cxx b/examples/MQ/5-req-rep/runExample5Server.cxx index 599710fe..2b1fbf43 100644 --- a/examples/MQ/5-req-rep/runExample5Server.cxx +++ b/examples/MQ/5-req-rep/runExample5Server.cxx @@ -23,10 +23,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample5Server server; server.CatchSignals(); diff --git a/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx b/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx index beffd641..08029b79 100644 --- a/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx +++ b/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx @@ -21,10 +21,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample6Broadcaster broadcaster; broadcaster.CatchSignals(); diff --git a/examples/MQ/6-multiple-channels/runExample6Sampler.cxx b/examples/MQ/6-multiple-channels/runExample6Sampler.cxx index 85d93c62..41472fee 100644 --- a/examples/MQ/6-multiple-channels/runExample6Sampler.cxx +++ b/examples/MQ/6-multiple-channels/runExample6Sampler.cxx @@ -32,10 +32,7 @@ int main(int argc, char** argv) FairMQProgOptions config; config.AddToCmdLineOptions(samplerOptions); - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample6Sampler sampler; sampler.CatchSignals(); diff --git a/examples/MQ/6-multiple-channels/runExample6Sink.cxx b/examples/MQ/6-multiple-channels/runExample6Sink.cxx index 06fa2c44..3da67091 100644 --- a/examples/MQ/6-multiple-channels/runExample6Sink.cxx +++ b/examples/MQ/6-multiple-channels/runExample6Sink.cxx @@ -21,10 +21,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample6Sink sink; sink.CatchSignals(); diff --git a/examples/MQ/8-multipart/runExample8Sampler.cxx b/examples/MQ/8-multipart/runExample8Sampler.cxx index 6002d4b1..0b75a46e 100644 --- a/examples/MQ/8-multipart/runExample8Sampler.cxx +++ b/examples/MQ/8-multipart/runExample8Sampler.cxx @@ -21,10 +21,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample8Sampler sampler; sampler.CatchSignals(); diff --git a/examples/MQ/8-multipart/runExample8Sink.cxx b/examples/MQ/8-multipart/runExample8Sink.cxx index 4f452faf..77831f59 100644 --- a/examples/MQ/8-multipart/runExample8Sink.cxx +++ b/examples/MQ/8-multipart/runExample8Sink.cxx @@ -21,10 +21,7 @@ int main(int argc, char** argv) try { FairMQProgOptions config; - if (config.ParseAll(argc, argv)) - { - return 0; - } + config.ParseAll(argc, argv); FairMQExample8Sink sink; sink.CatchSignals();