From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 15 Oct 2014 21:19:25 +0000 (+0100)
Subject: eject: move unreachable code to preprocessor #else block [smatch scan]
X-Git-Tag: v2.26-rc1~295
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f7f155c0c73702457218e8fa8d08e88ea55b85f;p=thirdparty%2Futil-linux.git

eject: move unreachable code to preprocessor #else block [smatch scan]

eject.c:466 toggle_tray() info: ignoring unreachable code.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 91f1102abb..860610f5ae 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -433,9 +433,6 @@ static int eject_cdrom(int fd)
  */
 static void toggle_tray(int fd)
 {
-	struct timeval time_start, time_stop;
-	int time_elapsed;
-
 #ifdef CDROM_DRIVE_STATUS
 	/* First ask the CDROM for info, otherwise fall back to manual.  */
 	switch (ioctl(fd, CDROM_DRIVE_STATUS)) {
@@ -457,7 +454,9 @@ static void toggle_tray(int fd)
 	default:
 		abort();
 	}
-#endif
+#else
+	struct timeval time_start, time_stop;
+	int time_elapsed;
 
 	/* Try to open the CDROM tray and measure the time therefor
 	 * needed.  In my experience the function needs less than 0.05
@@ -481,6 +480,7 @@ static void toggle_tray(int fd)
 	 * closed before. This would mean that we are done.  */
 	if (time_elapsed < TRAY_WAS_ALREADY_OPEN_USECS)
 		close_tray(fd);
+#endif
 }
 
 /*