udev: use startswith() and streq()

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

diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 6275cff89968977403381e4f2aa13105e508114a..65e9f3ecca31f23b7ed726a42bb60c988bf25ed7 100644 (file)
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -52,7 +52,7 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
                 {}
         };
 
-        info(udev, "version %s\n", VERSION);
+        log_debug("version %s\n", VERSION);
 
         for (;;) {
                 int option;
@@ -61,7 +61,6 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
                 if (option == -1)
                         break;
 
-                dbg(udev, "option '%c'\n", option);
                 switch (option) {
                 case 'a':
                         action = optarg;
@@ -75,7 +74,7 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
                                 resolve_names = -1;
                         } else {
                                 fprintf(stderr, "resolve-names must be early, late or never\n");
-                                err(udev, "resolve-names must be early, late or never\n");
+                                log_error("resolve-names must be early, late or never\n");
                                 exit(EXIT_FAILURE);
                         }
                         break;
@@ -96,7 +95,7 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
                 goto out;
         }
 
-        printf("This program is for debugging only, it does not run any program,\n"
+        printf("This program is for debugging only, it does not run any program\n"
                "specified by a RUN key. It may show incorrect results, because\n"
                "some values may be different, or not available at a simulation run.\n"
                "\n");
@@ -113,8 +112,8 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
         }
 
         /* add /sys if needed */
-        if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
-                util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), syspath, NULL);
+        if (!startswith(syspath, "/sys"))
+                util_strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
         else
                 util_strscpy(filename, sizeof(filename), syspath);
         util_remove_trailing_chars(filename, '/');