From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 23 Feb 2017 08:18:42 +0000 (-0500)
Subject: udev/collect: remove now-unused struct udev
X-Git-Tag: v234~206^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5432%2Fhead;p=thirdparty%2Fsystemd.git

udev/collect: remove now-unused struct udev
---

diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 0b3c0f969a6..57dfb016f9b 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -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;
 }