| Message ID | 1348062698-4528-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 55d4fd3c24bd253bd96270c7fdf1bb862f3a3400 |
| Headers | show |
On Wed, 19 Sep 2012, Peter Maydell wrote: > For architectures which don't set HAS_AUDIO_CHOICE, improve the > '-soundhw help' message so that it doesn't simply print an empty > list, implying no sound support at all. > [..snip..] Applied, thanks.
On 19.09.2012 17:51, Peter Maydell wrote: > +#else > + printf("Machine has no user-selectable audio hardware " > + "(it may or may not have always-present audio hardware).\n"); Can't we add a linefeed here the same way it is written in the code? /mjt
On 19 September 2012 18:07, Michael Tokarev <mjt@tls.msk.ru> wrote: > On 19.09.2012 17:51, Peter Maydell wrote: > >> +#else >> + printf("Machine has no user-selectable audio hardware " >> + "(it may or may not have always-present audio hardware).\n"); > > Can't we add a linefeed here the same way it is written in the code? Since there's no way to know how big the user's terminal is I generally prefer to avoid linefeeds in error messages. -- PMM
diff --git a/arch_init.c b/arch_init.c index 47977de..f849f9b 100644 --- a/arch_init.c +++ b/arch_init.c @@ -922,11 +922,16 @@ void select_soundhw(const char *optarg) if (is_help_option(optarg)) { show_valid_cards: +#ifdef HAS_AUDIO_CHOICE printf("Valid sound card names (comma separated):\n"); for (c = soundhw; c->name; ++c) { printf ("%-11s %s\n", c->name, c->descr); } printf("\n-soundhw all will enable all of the above\n"); +#else + printf("Machine has no user-selectable audio hardware " + "(it may or may not have always-present audio hardware).\n"); +#endif exit(!is_help_option(optarg)); } else {
For architectures which don't set HAS_AUDIO_CHOICE, improve the '-soundhw help' message so that it doesn't simply print an empty list, implying no sound support at all. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- arch_init.c | 5 +++++ 1 file changed, 5 insertions(+)