logind: remove unused session->closing field

[elogind.git] / src / udev / udevadm-test.c

diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 2d8aa7913e517cde70705a2df3b4aa26953762a4..df1409bff64cdcb2c8a2f40e19b2036aecdb7b1e 100644 (file)
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -66,11 +66,11 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
                         action = optarg;
                         break;
                 case 'N':
                         action = optarg;
                         break;
                 case 'N':

-                        if (strcmp (optarg, "early") == 0) {
+                        if (streq (optarg, "early")) {

                                 resolve_names = 1;
                                 resolve_names = 1;

-                        } else if (strcmp (optarg, "late") == 0) {
+                        } else if (streq (optarg, "late")) {

                                 resolve_names = 0;
                                 resolve_names = 0;

-                        } else if (strcmp (optarg, "never") == 0) {
+                        } else if (streq (optarg, "never")) {

                                 resolve_names = -1;
                         } else {
                                 fprintf(stderr, "resolve-names must be early, late or never\n");
                                 resolve_names = -1;
                         } else {
                                 fprintf(stderr, "resolve-names must be early, late or never\n");


@@ -113,9 +113,9 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
 
         /* add /sys if needed */
         if (!startswith(syspath, "/sys"))
 
         /* add /sys if needed */
         if (!startswith(syspath, "/sys"))

-                util_strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
+                strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);

         else
         else

-                util_strscpy(filename, sizeof(filename), syspath);
+                strscpy(filename, sizeof(filename), syspath);

         util_remove_trailing_chars(filename, '/');
 
         dev = udev_device_new_from_syspath(udev, filename);
         util_remove_trailing_chars(filename, '/');
 
         dev = udev_device_new_from_syspath(udev, filename);