Include suggested changes by clang-tidy

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index cebeca378c69eaf1001229ff7340ae33d4c4e86b..dc3f739f25cdac5451502ca2e3462cf7acc93df6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -24,6 +24,7 @@
 #include <cstdint>
 #include <fstream>
 #include <getopt.h>
+#include <vector>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -154,7 +155,6 @@ void usage()
                "  -i, --input-file                Load input from file\n"
                "  -I, --input-format              Input format\n"
                "  -c, --clean                     Don't restore previous sessions on startup\n"
-               "  -s, --log-to-stdout             Don't use logging, output to stdout instead\n"
                "\n", PV_BIN_NAME);
 }
 
@@ -162,10 +162,10 @@ int main(int argc, char *argv[])
 {
        int ret = 0;
        shared_ptr<sigrok::Context> context;
-       string open_file, open_file_format, driver;
+       string open_file_format, driver;
+       vector<string> open_files;
        bool restore_sessions = true;
        bool do_scan = true;
-       bool do_logging = true;
 
        Application a(argc, argv);
 
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
                };
 
                const int c = getopt_long(argc, argv,
-                       "h?VDcsl:d:i:I:", long_options, nullptr);
+                       "h?VDcl:d:i:I:", long_options, nullptr);
                if (c == -1)
                        break;
 
@@ -236,7 +236,7 @@ int main(int argc, char *argv[])
                        break;
 
                case 'i':
-                       open_file = optarg;
+                       open_files.emplace_back(optarg);
                        break;
 
                case 'I':
@@ -246,27 +246,19 @@ int main(int argc, char *argv[])
                case 'c':
                        restore_sessions = false;
                        break;
-
-               case 's':
-                       do_logging = false;
-                       break;
                }
        }
+       argc -= optind;
+       argv += optind;
 
-       if (argc - optind > 1) {
-               fprintf(stderr, "Only one file can be opened.\n");
-               return 1;
-       }
-
-       if (argc - optind == 1)
-               open_file = argv[argc - 1];
+       for (int i = 0; i < argc; i++)
+               open_files.emplace_back(argv[i]);
 
        // Prepare the global settings since logging needs them early on
        pv::GlobalSettings settings;
        settings.set_defaults_where_needed();
 
-       if (do_logging)
-               pv::logging.init();
+       pv::logging.init();
 
        // Initialise libsigrok
        context = sigrok::Context::create();
@@ -315,10 +307,11 @@ int main(int argc, char *argv[])
                if (restore_sessions)
                        w.restore_sessions();
 
-               if (!open_file.empty())
-                       w.add_session_with_file(open_file, open_file_format);
-               else
+               if (open_files.empty())
                        w.add_default_session();
+               else
+                       for (string open_file : open_files)
+                               w.add_session_with_file(open_file, open_file_format);
 
 #ifdef ENABLE_SIGNALS
                if (SignalHandler::prepare_signals()) {