exception safety

2 files changed, 9 insertions, 9 deletions

diff --git a/src/antpm-downloader.cpp b/src/antpm-downloader.cpp
index 91e969f..6c7f5d9 100644
--- a/src/antpm-downloader.cpp
+++ b/src/antpm-downloader.cpp
@@ -147,7 +147,11 @@ main(int argc, char** argv)
   uint16_t eraseFileIdx   = 0x0000;
   int      verbosityLevel = antpm::Log::instance()->getLogReportingLevel();
   po::options_description desc("Allowed options");
-  desc.add_options()
+  std::vector<const char*> args(argv, argv+argc);
+  po::variables_map vm;
+  try
+  {
+    desc.add_options()
     ("help,h",                                                                    "produce help message")
     ("pairing,P", po::value<bool>(&pairing)->zero_tokens()->implicit_value(true), "Force pairing first")
     ("dir-only",  po::value<bool>(&dirOnly)->zero_tokens()->implicit_value(true), "Download and list device directory")
@@ -157,10 +161,6 @@ main(int argc, char** argv)
     ("version,V",                                               "Print version information")
     ;
 
-  std::vector<const char*> args(argv, argv+argc);
-  po::variables_map vm;
-  try
-  {
     //po::parsed_options parsed = po::parse_command_line(argc, argv, desc);
     po::parsed_options parsed = po::command_line_parser(argc, argv).options(desc).run();
     po::store(parsed, vm);
diff --git a/src/antpm-usbmon2ant.cpp b/src/antpm-usbmon2ant.cpp
index 2b26f00..a7aae53 100644
--- a/src/antpm-usbmon2ant.cpp
+++ b/src/antpm-usbmon2ant.cpp
@@ -66,7 +66,10 @@ main(int argc, char** argv)
   po::positional_options_description pd;
   pd.add("input-file", 1);
   po::options_description desc("Allowed options");
-  desc.add_options()
+  po::variables_map vm;
+  try
+  {
+    desc.add_options()
     ("help,h",                                                       "produce help message")
     ("op,O", po::value<string>(&op)->default_value("parse"), "possible modes of operation: parse|dump|usbmon|filter|count")
     //("d", po::value<bool>(&dump)->zero_tokens(), "diffable byte dumps + decoded strings")
@@ -76,9 +79,6 @@ main(int argc, char** argv)
     ("version,V",                                               "Print version information")
     ;
 
-  po::variables_map vm;
-  try
-  {
     //po::parsed_options parsed = po::parse_command_line(argc, argv, desc);
     po::parsed_options parsed = po::command_line_parser(argc, argv).options(desc).positional(pd).run();
     po::store(parsed, vm);