diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-05-16 18:11:50 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-05-16 18:11:50 +0200 |
| commit | 85e172c9bd223e08f31b466f86df3cca2b517216 (patch) | |
| tree | 9aed7b424a4dd503d530d15f990d5d3190fd87c3 | |
| parent | 079de714754b1e058f57220281e7f901d4c826d6 (diff) | |
cdrom_id: remove unused --export switch to silent gcc
| -rw-r--r-- | extras/cdrom_id/60-cdrom_id.rules | 2 | ||||
| -rw-r--r-- | extras/cdrom_id/cdrom_id.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules index aedf6f0558..1ad1d0cc23 100644 --- a/extras/cdrom_id/60-cdrom_id.rules +++ b/extras/cdrom_id/60-cdrom_id.rules @@ -9,6 +9,6 @@ ENV{DEVTYPE}!="disk", GOTO="cdrom_end" ENV{DISK_EJECT_REQUEST}=="?*", GOTO="cdrom_end" KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1" -IMPORT{program}="cdrom_id --export $tempnode" +IMPORT{program}="cdrom_id $tempnode" LABEL="cdrom_end" diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c index b2f897e3b5..7908f6d19a 100644 --- a/extras/cdrom_id/cdrom_id.c +++ b/extras/cdrom_id/cdrom_id.c @@ -825,13 +825,11 @@ int main(int argc, char *argv[]) { struct udev *udev; static const struct option options[] = { - { "export", no_argument, NULL, 'x' }, { "debug", no_argument, NULL, 'd' }, { "help", no_argument, NULL, 'h' }, {} }; const char *node = NULL; - int export = 0; int fd = -1; int cnt; int rc = 0; @@ -846,7 +844,7 @@ int main(int argc, char *argv[]) while (1) { int option; - option = getopt_long(argc, argv, "dxh", options, NULL); + option = getopt_long(argc, argv, "dh", options, NULL); if (option == -1) break; @@ -856,12 +854,8 @@ int main(int argc, char *argv[]) if (udev_get_log_priority(udev) < LOG_INFO) udev_set_log_priority(udev, LOG_INFO); break; - case 'x': - export = 1; - break; case 'h': printf("Usage: cdrom_id [options] <device>\n" - " --export export key/value pairs\n" " --debug debug to stderr\n" " --help print this help text\n\n"); goto exit; |