fixups to get back to proper patch order

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index f2b0c98edb2dd35a720c2960bbdd775c1a468098..37ec767e138ad189073255fa209065082e213c75 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,14 +29,10 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "logging.h"
 
 
 #ifdef LOG
@@ -62,9 +58,6 @@ int main(int argc, char *argv[], char *envp[])
        char *subsystem = "";
        struct udevice udev;
 
-       main_argv = argv;
-       main_envp = envp;
-
        info("version %s", UDEV_VERSION);
 
        if (argv[1] == NULL) {
@@ -103,15 +96,17 @@ int main(int argc, char *argv[], char *envp[])
                subsystem = argv[2];
 
        /* fill in values and test_run flag*/
-       udev_set_values(&udev, devpath, subsystem);
+       udev_set_values(&udev, devpath, subsystem, "add");
 
        /* open the device */
        snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
        class_dev = sysfs_open_class_device_path(path);
-       if (class_dev == NULL)
-               dbg ("sysfs_open_class_device_path failed");
-       else
-               dbg("opened class_dev->name='%s'", class_dev->name);
+       if (class_dev == NULL) {
+               info("sysfs_open_class_device_path failed");
+               return 1;
+       }
+
+       dbg("opened class_dev->name='%s'", class_dev->name);
 
        /* simulate node creation with test flag */
        udev.test_run = 1;