mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: print usage to stdout on success (not stderr) - this time really

Browse Source 
Fix all the other printfs too.

https://gitlab.freedesktop.org/wayland/weston/issues/112

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Peter Hutterer
2018-06-12 10:42:18 +10:00
committed by Pekka Paalanen
parent 70e8a32fb7
commit a1fd4302bc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/main.c
+9 -7
View File
@@ -438,7 +438,9 @@ verify_xdg_runtime_dir(void)
static int static int
usage(int error_code) 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" "Usage: weston [OPTIONS]\n\n"
"This is weston version " VERSION ", the Wayland reference compositor.\n" "This is weston version " VERSION ", the Wayland reference compositor.\n"
"Weston supports multiple backends, and depending on which backend is in use\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"); " -h, --help\t\tThis help message\n\n");
#if defined(BUILD_DRM_COMPOSITOR) #if defined(BUILD_DRM_COMPOSITOR)
fprintf(stderr, fprintf(out,
"Options for drm-backend.so:\n\n" "Options for drm-backend.so:\n\n"
" --seat=SEAT\t\tThe seat that weston should run on\n" " --seat=SEAT\t\tThe seat that weston should run on\n"
" --tty=TTY\t\tThe tty to use\n" " --tty=TTY\t\tThe tty to use\n"
@@ -488,7 +490,7 @@ usage(int error_code)
#endif #endif
#if defined(BUILD_FBDEV_COMPOSITOR) #if defined(BUILD_FBDEV_COMPOSITOR)
fprintf(stderr, fprintf(out,
"Options for fbdev-backend.so:\n\n" "Options for fbdev-backend.so:\n\n"
" --tty=TTY\t\tThe tty to use\n" " --tty=TTY\t\tThe tty to use\n"
" --device=DEVICE\tThe framebuffer device to use\n" " --device=DEVICE\tThe framebuffer device to use\n"
@@ -496,7 +498,7 @@ usage(int error_code)
#endif #endif
#if defined(BUILD_HEADLESS_COMPOSITOR) #if defined(BUILD_HEADLESS_COMPOSITOR)
fprintf(stderr, fprintf(out,
"Options for headless-backend.so:\n\n" "Options for headless-backend.so:\n\n"
" --width=WIDTH\t\tWidth of memory surface\n" " --width=WIDTH\t\tWidth of memory surface\n"
" --height=HEIGHT\tHeight of memory surface\n" " --height=HEIGHT\tHeight of memory surface\n"
@@ -508,7 +510,7 @@ usage(int error_code)
#endif #endif
#if defined(BUILD_RDP_COMPOSITOR) #if defined(BUILD_RDP_COMPOSITOR)
fprintf(stderr, fprintf(out,
"Options for rdp-backend.so:\n\n" "Options for rdp-backend.so:\n\n"
" --width=WIDTH\t\tWidth of desktop\n" " --width=WIDTH\t\tWidth of desktop\n"
" --height=HEIGHT\tHeight of desktop\n" " --height=HEIGHT\tHeight of desktop\n"
@@ -523,7 +525,7 @@ usage(int error_code)
#endif #endif
#if defined(BUILD_WAYLAND_COMPOSITOR) #if defined(BUILD_WAYLAND_COMPOSITOR)
fprintf(stderr, fprintf(out,
"Options for wayland-backend.so:\n\n" "Options for wayland-backend.so:\n\n"
" --width=WIDTH\t\tWidth of Wayland surface\n" " --width=WIDTH\t\tWidth of Wayland surface\n"
" --height=HEIGHT\tHeight of Wayland surface\n" " --height=HEIGHT\tHeight of Wayland surface\n"
@@ -536,7 +538,7 @@ usage(int error_code)
#endif #endif
#if defined(BUILD_X11_COMPOSITOR) #if defined(BUILD_X11_COMPOSITOR)
fprintf(stderr, fprintf(out,
"Options for x11-backend.so:\n\n" "Options for x11-backend.so:\n\n"
" --width=WIDTH\t\tWidth of X window\n" " --width=WIDTH\t\tWidth of X window\n"
" --height=HEIGHT\tHeight of X window\n" " --height=HEIGHT\tHeight of X window\n"