X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Ftest-udev.c;h=150cb16a3103a31ea7a9a2884493765b95996050;hb=b8b5e648cacc8d73c55fdffbb3466ecd8146131a;hp=c9712e974dca9b74722a9f29acfa8ade314b415f;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed;p=elogind.git

diff --git a/src/udev/test-udev.c b/src/udev/test-udev.c
index c9712e974..150cb16a3 100644
--- a/src/udev/test-udev.c
+++ b/src/udev/test-udev.c
@@ -48,21 +48,21 @@ int main(int argc, char *argv[])
 
         udev = udev_new();
         if (udev == NULL)
-                exit(1);
-        info(udev, "version %s\n", VERSION);
+                exit(EXIT_FAILURE);
+        log_debug("version %s\n", VERSION);
         udev_selinux_init(udev);
 
         sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
 
         action = argv[1];
         if (action == NULL) {
-                err(udev, "action missing\n");
+                log_error("action missing\n");
                 goto out;
         }
 
         devpath = argv[2];
         if (devpath == NULL) {
-                err(udev, "devpath missing\n");
+                log_error("devpath missing\n");
                 goto out;
         }
 
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
         util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
         dev = udev_device_new_from_syspath(udev, syspath);
         if (dev == NULL) {
-                info(udev, "unknown device '%s'\n", devpath);
+                log_debug("unknown device '%s'\n", devpath);
                 goto out;
         }
 
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
         /* do what devtmpfs usually provides us */
         if (udev_device_get_devnode(dev) != NULL) {
-                mode_t mode;
+                mode_t mode = 0600;
 
                 if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
                         mode |= S_IFBLK;
@@ -116,6 +116,6 @@ out:
         udev_selinux_exit(udev);
         udev_unref(udev);
         if (err != 0)
-                return 1;
-        return 0;
+                return EXIT_FAILURE;
+        return EXIT_SUCCESS;
 }