From 9377e0d3b2eeba165921d0a31c2bcce141157461 Mon Sep 17 00:00:00 2001 From: Sean Robinson Date: Wed, 29 Mar 2023 08:42:12 -0700 Subject: [PATCH] Use return in place of exit() in README and samples Only those places in the README where an error is explicitly found in the main function have been updated. Other uses of exit are left untouched as there is not enough context to know if return will work in that location. Signed-off-by: Sean Robinson --- README.md | 10 +++++----- samples/compound_arguments.cpp | 2 +- samples/custom_assignment_characters.cpp | 2 +- samples/custom_prefix_characters.cpp | 2 +- samples/gathering_remaining_arguments.cpp | 2 +- samples/is_used.cpp | 2 +- samples/joining_repeated_optional_arguments.cpp | 2 +- samples/list_of_arguments.cpp | 2 +- samples/negative_numbers.cpp | 2 +- samples/optional_flag_argument.cpp | 2 +- samples/positional_argument.cpp | 2 +- samples/required_optional_argument.cpp | 2 +- samples/subcommands.cpp | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8bc2c0d..77a2bb4 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) { catch (const std::runtime_error& err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } auto input = program.get("square"); @@ -781,7 +781,7 @@ int main(int argc, char *argv[]) { catch (const std::runtime_error& err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } // Use arguments @@ -908,7 +908,7 @@ int main(int argc, char *argv[]) { catch (const std::runtime_error& err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program.is_used("+f")) { @@ -956,7 +956,7 @@ int main(int argc, char *argv[]) { catch (const std::runtime_error& err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program.is_used("--foo")) { @@ -1104,7 +1104,7 @@ int main(int argc, char *argv[]) { catch (const std::runtime_error& err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program.is_used("--foo")) { diff --git a/samples/compound_arguments.cpp b/samples/compound_arguments.cpp index 66d5c92..4cfc037 100644 --- a/samples/compound_arguments.cpp +++ b/samples/compound_arguments.cpp @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } auto a = program.get("-a"); // true diff --git a/samples/custom_assignment_characters.cpp b/samples/custom_assignment_characters.cpp index d5deff1..7e35ae0 100644 --- a/samples/custom_assignment_characters.cpp +++ b/samples/custom_assignment_characters.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program.is_used("--foo")) { diff --git a/samples/custom_prefix_characters.cpp b/samples/custom_prefix_characters.cpp index 01e248a..9f8917a 100644 --- a/samples/custom_prefix_characters.cpp +++ b/samples/custom_prefix_characters.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program.is_used("+f")) { diff --git a/samples/gathering_remaining_arguments.cpp b/samples/gathering_remaining_arguments.cpp index 4f40454..be13f10 100644 --- a/samples/gathering_remaining_arguments.cpp +++ b/samples/gathering_remaining_arguments.cpp @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } try { diff --git a/samples/is_used.cpp b/samples/is_used.cpp index 27e0373..ffc05f8 100644 --- a/samples/is_used.cpp +++ b/samples/is_used.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } auto color = program.get("--color"); // "orange" diff --git a/samples/joining_repeated_optional_arguments.cpp b/samples/joining_repeated_optional_arguments.cpp index eebbdc6..0f6ab81 100644 --- a/samples/joining_repeated_optional_arguments.cpp +++ b/samples/joining_repeated_optional_arguments.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } auto colors = program.get>( diff --git a/samples/list_of_arguments.cpp b/samples/list_of_arguments.cpp index e533e47..996e748 100644 --- a/samples/list_of_arguments.cpp +++ b/samples/list_of_arguments.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } auto files = program.get>( diff --git a/samples/negative_numbers.cpp b/samples/negative_numbers.cpp index ac4284f..319245f 100644 --- a/samples/negative_numbers.cpp +++ b/samples/negative_numbers.cpp @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program.is_used("integer")) { diff --git a/samples/optional_flag_argument.cpp b/samples/optional_flag_argument.cpp index 2f85954..f935ecf 100644 --- a/samples/optional_flag_argument.cpp +++ b/samples/optional_flag_argument.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } if (program["--verbose"] == true) { diff --git a/samples/positional_argument.cpp b/samples/positional_argument.cpp index 03ffb0a..4343863 100644 --- a/samples/positional_argument.cpp +++ b/samples/positional_argument.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } int input = program.get("square"); diff --git a/samples/required_optional_argument.cpp b/samples/required_optional_argument.cpp index efea523..0271f50 100644 --- a/samples/required_optional_argument.cpp +++ b/samples/required_optional_argument.cpp @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } std::cout << "Output written to " << program.get("-o") << "\n"; diff --git a/samples/subcommands.cpp b/samples/subcommands.cpp index 74d610e..ba1059d 100644 --- a/samples/subcommands.cpp +++ b/samples/subcommands.cpp @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) { } catch (const std::runtime_error &err) { std::cerr << err.what() << std::endl; std::cerr << program; - std::exit(1); + return 1; } // Use arguments