error(1, ...) already will exit, per man page: "If status has a nonzero
value, then error() calls exit(3) to terminate the program using the
given value as the exit status."  So exit(EXIT_FAILURE) is never
reached.

The EXIT_FAILURE macro is guaranteed to be non-zero.  Typically it's
just 1, but on some systems (e.g. OpenVMS apparently) exit(1) means
success so EXIT_FAILURE there is defined to some other non-zero value.

Signed-off-by: Bryce Harrington <[email protected]>
---
 src/weston-launch.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/weston-launch.c b/src/weston-launch.c
index f67aaaf..90a070f 100644
--- a/src/weston-launch.c
+++ b/src/weston-launch.c
@@ -738,10 +738,8 @@ main(int argc, char *argv[])
                exit(EXIT_FAILURE);
 
        wl.child = fork();
-       if (wl.child == -1) {
-               error(1, errno, "fork failed");
-               exit(EXIT_FAILURE);
-       }
+       if (wl.child == -1)
+               error(EXIT_FAILURE, errno, "fork failed");
 
        if (wl.child == 0)
                launch_compositor(&wl, argc - optind, argv + optind);
-- 
1.9.1

_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to