X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=78a131a5f1e108c9548cc34f1f19ea5bea6e6abb;hp=daec62d2af09055409677d90885bc9faac5ce4af;hb=d60820d865b8044aa6447a49861eac0dd0a6a4d4;hpb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f diff --git a/main.cpp b/main.cpp index daec62d2..78a131a5 100644 --- a/main.cpp +++ b/main.cpp @@ -84,12 +84,12 @@ int main(int argc, char *argv[]) // Parse arguments while (1) { static const struct option long_options[] = { - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {"loglevel", required_argument, 0, 'l'}, - {"input-file", required_argument, 0, 'i'}, - {"input-format", required_argument, 0, 'I'}, - {0, 0, 0, 0} + {"help", no_argument, nullptr, 'h'}, + {"version", no_argument, nullptr, 'V'}, + {"loglevel", required_argument, nullptr, 'l'}, + {"input-file", required_argument, nullptr, 'i'}, + {"input-format", required_argument, nullptr, 'I'}, + {nullptr, 0, nullptr, 0} }; const int c = getopt_long(argc, argv, @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) } if (argc - optind > 1) { - fprintf(stderr, "Only one file can be openened.\n"); + fprintf(stderr, "Only one file can be opened.\n"); return 1; } else if (argc - optind == 1) { open_file = argv[argc - 1]; @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) // Run the application ret = a.exec(); - } catch(std::exception e) { + } catch (std::exception e) { qDebug() << e.what(); }