SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdrom_id: remove unused --export switch to silent gcc

Browse Source
This commit is contained in:
Kay Sievers
2011-05-16 18:11:50 +02:00
parent 079de71475
commit 85e172c9bd
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/cdrom_id/60-cdrom_id.rules
+1 -1
View File
@@ -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"
extras/cdrom_id/cdrom_id.c
+1 -7
View File
@@ -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;