c++: atoi() -> std::stoi() (throws if string cant' be converted)

axxel · axxel · commit 317c4a1b611b · 2025-04-29T23:28:49.000+02:00
diff --git a/example/ZXingReader.cpp b/example/ZXingReader.cpp
@@ -144,11 +144,11 @@ static bool ParseOptions(int argc, char* argv[], ReaderOptions& options, CLI& cl
 		} else if (is("-channels")) {
 			if (++i == argc)
 				return false;
-			cli.forceChannels = atoi(argv[i]);
+			cli.forceChannels = std::stoi(argv[i]);
 		} else if (is("-rotate")) {
 			if (++i == argc)
 				return false;
-			cli.rotate = atoi(argv[i]);
+			cli.rotate = std::stoi(argv[i]);
 		} else if (is("-help") || is("--help")) {
 			PrintUsage(argv[0]);
 			exit(0);
diff --git a/test/blackbox/TestReaderMain.cpp b/test/blackbox/TestReaderMain.cpp
@@ -21,7 +21,7 @@ using namespace ZXing::Test;
 int getEnv(const char* name, int fallback = 0)
 {
 	auto var = getenv(name);
-	return var ? atoi(var) : fallback;
+	return var ? std::stoi(var) : fallback;
 }
 
 int main(int argc, char** argv)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ using namespace ZXing::Test;`
`21`	`21`	`int getEnv(const char* name, int fallback = 0)`
`22`	`22`	`{`
`23`	`23`	`auto var = getenv(name);`
`24`		`- return var ? atoi(var) : fallback;`
	`24`	`+ return var ? std::stoi(var) : fallback;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`int main(int argc, char** argv)`