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

udev/collect: remove now-unused struct udev

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