X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=690a559c29e9a8952b74e2a840475b227650d5b3;hp=51e6100295d18efc113d825351ee4390a54eb0ba;hb=207ae8f6fb0b7a797349916afcd70e1add1b4d20;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/main.cpp b/main.cpp
index 51e61002..690a559c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,7 +21,7 @@
 #include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
-#include <stdint.h>
+#include <cstdint>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 #endif
 
 	// Parse arguments
-	while (1) {
+	while (true) {
 		static const struct option long_options[] = {
 			{"help", no_argument, nullptr, 'h'},
 			{"version", no_argument, nullptr, 'V'},
@@ -136,10 +136,11 @@ int main(int argc, char *argv[])
 	if (argc - optind > 1) {
 		fprintf(stderr, "Only one file can be opened.\n");
 		return 1;
-	} else if (argc - optind == 1) {
-		open_file = argv[argc - 1];
 	}
 
+	if (argc - optind == 1)
+		open_file = argv[argc - 1];
+
 	// Initialise libsigrok
 	context = sigrok::Context::create();
 #ifdef ANDROID
@@ -195,7 +196,7 @@ int main(int argc, char *argv[])
 		srd_exit();
 #endif
 
-	} while (0);
+	} while (false);
 
 	return ret;
 }