diff options
| author | Karel Zak | 2012-03-27 13:35:06 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-03-27 13:35:06 +0200 |
| commit | aa8cb034d7eed5d88c64767c20b30b08568ab7e6 (patch) | |
| tree | 4f18eb1ddc78f6f43d9a8ba04609d34d050f767d /misc-utils/eject.c | |
| parent | sysfs: move blkid_devno_to_wholedisk to sysfs_devno_to_wholedisk (diff) | |
| download | kernel-qcow2-util-linux-aa8cb034d7eed5d88c64767c20b30b08568ab7e6.tar.gz kernel-qcow2-util-linux-aa8cb034d7eed5d88c64767c20b30b08568ab7e6.tar.xz kernel-qcow2-util-linux-aa8cb034d7eed5d88c64767c20b30b08568ab7e6.zip | |
eject: coding style fixes
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/eject.c')
| -rw-r--r-- | misc-utils/eject.c | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/misc-utils/eject.c b/misc-utils/eject.c index c2a67f882..91d52bdaa 100644 --- a/misc-utils/eject.c +++ b/misc-utils/eject.c @@ -1,12 +1,7 @@ -/******************************************************************** - * - * L I N U X E J E C T C O M M A N D - * - * by Jeff Tranter (tranter@pobox.com) - * - ******************************************************************** - * +/* * Copyright (C) 1994-2005 Jeff Tranter (tranter@pobox.com) + * Copyright (C) 2012 Karel Zak <kzak@redhat.com> + * Copyright (C) Michal Luscon <mluscon@redhat.com> * * 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 @@ -21,23 +16,8 @@ * 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 - * - ******************************************************************** - * - * See the man page for a description of what this program does and what - * the requirements to run it are. - * */ -#include "linux_version.h" -#include "c.h" -#include "nls.h" -#include "strutils.h" -#include "xalloc.h" -#include "canonicalize.h" - -#define EJECT_DEFAULT_DEVICE "/dev/cdrom" - #include <unistd.h> #include <stdlib.h> #include <stdio.h> @@ -63,6 +43,16 @@ #include <scsi/scsi_ioctl.h> #include <sys/time.h> +#include "linux_version.h" +#include "c.h" +#include "nls.h" +#include "strutils.h" +#include "xalloc.h" +#include "canonicalize.h" + +#define EJECT_DEFAULT_DEVICE "/dev/cdrom" + + /* Used by the toggle_tray() function. If ejecting the tray takes this * time or less, the tray was probably already ejected, so we close it * again. @@ -75,7 +65,6 @@ static int a_option; /* command flags and arguments */ static int c_option; static int d_option; static int f_option; -static int h_option; static int n_option; static int q_option; static int r_option; @@ -241,9 +230,9 @@ static void parse_args(int argc, char **argv, char **device) break; case 'V': printf(UTIL_LINUX_VERSION); - exit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); break; - default: + default: case '?': usage(); break; @@ -725,13 +714,12 @@ int main(int argc, char **argv) { char *mountName; /* name of device's mount point */ int fd; /* file descriptor for device */ int mounted = 0; /* true if device is mounted */ - int mountable = 0; /* true if device is in /etc/fstab */ char *pattern; /* regex for device if multiple partitions */ int ld = 6; /* symbolic link max depth */ setlocale(LC_ALL,""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); /* program name is global variable used by other procedures */ char *programName = program_invocation_short_name; |