From: Bryce Harrington <bryce@osg.samsung.com>
Date: Fri, 19 Jun 2015 22:47:40 +0000 (-0700)
Subject: weston-launch: Drop redundant exit()
X-Git-Tag: 1.8.91~112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=430aee1c23a641cf3227bcde08419458ef2ea252;p=platform%2Fupstream%2Fweston.git

weston-launch: Drop redundant exit()

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>
---

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);