ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Sami Kerola 2014-10-15 22:19:25 +01:00 committed by Karel Zak
parent 732ac3a52a
commit 6f7f155c0c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys-utils/eject.c
View File

@ -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
}
/*