picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udev/collect: remove now-unused struct udev

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-23 03:18:42 -05:00
parent b237a168df
commit 3cf3392364
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/udev/collect/collect.c
View File

@ -344,9 +344,7 @@ static void everybody(void)
}
}
int main(int argc, char **argv)
{
struct udev *udev;
int main(int argc, char **argv) {
static const struct option options[] = {
{ "add", no_argument, NULL, 'a' },
{ "remove", no_argument, NULL, 'r' },
@ -367,12 +365,6 @@ int main(int argc, char **argv)
log_parse_environment();
log_open();
udev = udev_new();
if (udev == NULL) {
ret = EXIT_FAILURE;
goto exit;
}
for (;;) {
int option;
@ -392,26 +384,23 @@ int main(int argc, char **argv)
break;
case 'h':
usage();
goto exit;
return 0;
default:
ret = 1;
goto exit;
return 1;
}
}
argi = optind;
if (argi + 2 > argc) {
printf("Missing parameter(s)\n");
ret = 1;
goto exit;
return 1;
}
checkpoint = argv[argi++];
us = argv[argi++];
if (signal(SIGALRM, sig_alrm) == SIG_ERR) {
fprintf(stderr, "Cannot set SIGALRM: %m\n");
ret = 2;
goto exit;
return 2;
}
udev_list_node_init(&bunch);
@ -491,7 +480,5 @@ out:
everybody();
if (ret >= 0)
printf("COLLECT_%s=%d\n", checkpoint, ret);
exit:
udev_unref(udev);
return ret;
}