From 316880b9cf9eca5b2607458d123a0b9dbf0fee69 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 15 Aug 2019 01:07:41 +0200 Subject: Don't print usage to stdout for invalid parameters --- session_utils/copy-mixer.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'session_utils/copy-mixer.cc') diff --git a/session_utils/copy-mixer.cc b/session_utils/copy-mixer.cc index 529f32eecc..e1e8526b31 100644 --- a/session_utils/copy-mixer.cc +++ b/session_utils/copy-mixer.cc @@ -246,7 +246,7 @@ copy_session_routes ( } -static void usage (int status) { +static void usage () { // help2man compatible format (standard GNU help-text) printf (UTILNAME " - copy mixer settings from one session to another.\n\n"); printf ("Usage: " UTILNAME " [ OPTIONS ] \n\n"); @@ -270,7 +270,7 @@ When --snapshot is set, a new snaphot in the session is created.\n\ printf ("Report bugs to \n" "Website: \n"); - ::exit (status); + ::exit (EXIT_SUCCESS); } static bool ends_with (std::string const& value, std::string const& ending) @@ -308,7 +308,7 @@ int main (int argc, char* argv[]) break; case 'h': - usage (EXIT_SUCCESS); + usage (); break; case 'l': @@ -330,15 +330,17 @@ int main (int argc, char* argv[]) break; default: - usage (EXIT_FAILURE); - break; + cerr << "Error: unrecognized option. See --help for usage information.\n"; + ::exit (EXIT_FAILURE); + break; } } // TODO parse path/name from a single argument. if (optind + 2 > argc) { - usage (EXIT_FAILURE); + cerr << "Error: Missing parameter. See --help for usage information.\n"; + ::exit (EXIT_FAILURE); } std::string src = argv[optind]; -- cgit v1.2.3