svn commit: trunk/busybox/miscutils

[landley at busybox.net]

Author: landley
Date: 2006-02-27 20:45:24 -0800 (Mon, 27 Feb 2006)
New Revision: 14344

Log:
Cosmetic cleanup from tito.


Modified:
   trunk/busybox/miscutils/eject.c


Changeset:
Modified: trunk/busybox/miscutils/eject.c
===================================================================
--- trunk/busybox/miscutils/eject.c	2006-02-28 03:53:14 UTC (rev 14343)
+++ trunk/busybox/miscutils/eject.c	2006-02-28 04:45:24 UTC (rev 14344)
@@ -2,21 +2,10 @@
  * eject implementation for busybox
  *
  * Copyright (C) 2004  Peter Willis <psyphreak at phreaker.net>
+ * Copyright (C) 2005  Tito Ragusa <farmatito at tiscali.it>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
  */
 
 /*
@@ -43,17 +32,18 @@
 	struct mntent *m;
 
 	flags = bb_getopt_ulflags(argc, argv, "t");
-	device=argv[optind] ? : DEFAULT_CDROM;
+	device = argv[optind] ? : DEFAULT_CDROM;
 
-	if((m = find_mount_point(device, bb_path_mtab_file))) {
-		if(umount(m->mnt_dir))
+	if ((m = find_mount_point(device, bb_path_mtab_file))) {
+		if (umount(m->mnt_dir)) {
 			bb_error_msg_and_die("Can't umount");
-		else if(ENABLE_FEATURE_MTAB_SUPPORT) erase_mtab(m->mnt_fsname);
+		} else if (ENABLE_FEATURE_MTAB_SUPPORT) {
+			erase_mtab(m->mnt_fsname);
+		}
 	}
-	if (ioctl(bb_xopen( device, (O_RDONLY | O_NONBLOCK)),
-	          ( flags ? CDROMCLOSETRAY : CDROMEJECT)))
-	{
+	if (ioctl(bb_xopen(device, (O_RDONLY | O_NONBLOCK)),
+				(flags ? CDROMCLOSETRAY : CDROMEJECT))) {
 		bb_perror_msg_and_die(device);
 	}
-	return(EXIT_SUCCESS);
+	return (EXIT_SUCCESS);
 }