weston-launch: Drop redundant exit()
authorBryce Harrington <bryce@osg.samsung.com>
Fri, 19 Jun 2015 22:47:40 +0000 (15:47 -0700)
committerBryce Harrington <bryce@osg.samsung.com>
Fri, 10 Jul 2015 07:08:58 +0000 (00:08 -0700)
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 <bryce@osg.samsung.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
src/weston-launch.c

index f67aaaf..90a070f 100644 (file)
@@ -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);