On Tue, 12 Jun 2018 10:42:18 +1000 Peter Hutterer <[email protected]> wrote:
> Signed-off-by: Peter Hutterer <[email protected]> > --- > > sorry... No prob! We both failed to see it before it was too late. :-) Thanks for taking care of it so fast. Pushed: 70e8a32f..a1fd4302 master -> master I added a commit message and a link to the bug report, so gitlab will make a link from the issue to the commit. Thanks, pq > > compositor/main.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/compositor/main.c b/compositor/main.c > index 93f92fdc..86e3782f 100644 > --- a/compositor/main.c > +++ b/compositor/main.c > @@ -438,7 +438,9 @@ verify_xdg_runtime_dir(void) > static int > usage(int error_code) > { > - fprintf(error_code == EXIT_SUCCESS ? stdout : stderr, > + FILE *out = error_code == EXIT_SUCCESS ? stdout : stderr; > + > + fprintf(out, > "Usage: weston [OPTIONS]\n\n" > "This is weston version " VERSION ", the Wayland reference > compositor.\n" > "Weston supports multiple backends, and depending on which > backend is in use\n" > @@ -478,7 +480,7 @@ usage(int error_code) > " -h, --help\t\tThis help message\n\n"); > > #if defined(BUILD_DRM_COMPOSITOR) > - fprintf(stderr, > + fprintf(out, > "Options for drm-backend.so:\n\n" > " --seat=SEAT\t\tThe seat that weston should run on\n" > " --tty=TTY\t\tThe tty to use\n" > @@ -488,7 +490,7 @@ usage(int error_code) > #endif > > #if defined(BUILD_FBDEV_COMPOSITOR) > - fprintf(stderr, > + fprintf(out, > "Options for fbdev-backend.so:\n\n" > " --tty=TTY\t\tThe tty to use\n" > " --device=DEVICE\tThe framebuffer device to use\n" > @@ -496,7 +498,7 @@ usage(int error_code) > #endif > > #if defined(BUILD_HEADLESS_COMPOSITOR) > - fprintf(stderr, > + fprintf(out, > "Options for headless-backend.so:\n\n" > " --width=WIDTH\t\tWidth of memory surface\n" > " --height=HEIGHT\tHeight of memory surface\n" > @@ -508,7 +510,7 @@ usage(int error_code) > #endif > > #if defined(BUILD_RDP_COMPOSITOR) > - fprintf(stderr, > + fprintf(out, > "Options for rdp-backend.so:\n\n" > " --width=WIDTH\t\tWidth of desktop\n" > " --height=HEIGHT\tHeight of desktop\n" > @@ -523,7 +525,7 @@ usage(int error_code) > #endif > > #if defined(BUILD_WAYLAND_COMPOSITOR) > - fprintf(stderr, > + fprintf(out, > "Options for wayland-backend.so:\n\n" > " --width=WIDTH\t\tWidth of Wayland surface\n" > " --height=HEIGHT\tHeight of Wayland surface\n" > @@ -536,7 +538,7 @@ usage(int error_code) > #endif > > #if defined(BUILD_X11_COMPOSITOR) > - fprintf(stderr, > + fprintf(out, > "Options for x11-backend.so:\n\n" > " --width=WIDTH\t\tWidth of X window\n" > " --height=HEIGHT\tHeight of X window\n"
pgpGnRUVh702O.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
