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/new_empty_session.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'session_utils/new_empty_session.cc') diff --git a/session_utils/new_empty_session.cc b/session_utils/new_empty_session.cc index 2871852e1e..86fba1a324 100644 --- a/session_utils/new_empty_session.cc +++ b/session_utils/new_empty_session.cc @@ -29,7 +29,7 @@ using namespace ARDOUR; using namespace SessionUtils; -static void usage (int status) +static void usage () { // help2man compatible format (standard GNU help-text) printf (UTILNAME " - create a new empty session from the commandline.\n\n"); @@ -55,7 +55,7 @@ Examples:\n\ printf ("Report bugs to \n" "Website: \n"); - ::exit (status); + ::exit (EXIT_SUCCESS); } int main (int argc, char* argv[]) @@ -92,11 +92,12 @@ int main (int argc, char* argv[]) break; case 'h': - usage (EXIT_SUCCESS); + usage (); break; default: - usage (EXIT_FAILURE); + cerr << "Error: unrecognized option. See --help for usage information.\n"; + ::exit (EXIT_FAILURE); break; } } @@ -108,11 +109,12 @@ int main (int argc, char* argv[]) } else if (optind + 1 == argc) { snapshot_name = Glib::path_get_basename (argv[optind]); } else { - usage (EXIT_FAILURE); + cerr << "Error: Missing parameter. See --help for usage information.\n"; + ::exit (EXIT_FAILURE); } if (snapshot_name.empty ()) { - fprintf(stderr, "Error: Invalid empty session/snapshot name.\n"); + cerr << "Error: Invalid empty session/snapshot name.\n"; ::exit (EXIT_FAILURE); } -- cgit v1.2.3