[PATCH] remove unused variables

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index fa1629af2552197023f35b5facb51613082b4a37..38e2bb7562348c54168050a5d8de932d13228bf8 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
@@ -59,25 +55,23 @@ int main(int argc, char *argv[], char *envp[])
        char *devpath;
        char path[SYSFS_PATH_MAX];
        char temp[NAME_SIZE];
-       char *subsystem = "";
        struct udevice udev;
-
-       main_argv = argv;
-       main_envp = envp;
+       char *subsystem = NULL;
 
        info("version %s", UDEV_VERSION);
 
-       if (argv[1] == NULL) {
-               info("udevinfo expects the DEVPATH of the sysfs device as a argument");
-               goto exit;
+       if (argc < 2 || argc > 3) {
+               info("Usage: udevtest <devpath> [subsystem]");
+               return 1;
        }
 
        /* initialize our configuration */
        udev_init_config();
 
        /* remove sysfs_path if given */
-       if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
-               devpath = argv[1] + strlen(sysfs_path);
+       if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+               devpath = &argv[1][strlen(sysfs_path)] ;
+       }
        else
                if (argv[1][0] != '/') {
                        /* prepend '/' if missing */
@@ -93,30 +87,33 @@ int main(int argc, char *argv[], char *envp[])
        /* we only care about class devices and block stuff */
        if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
                dbg("not a block or class device");
-               goto exit;
+               return 2;
        }
 
        /* initialize the naming deamon */
        namedev_init();
 
-       if (argv[2] != NULL)
+       if (argc == 3)
                subsystem = argv[2];
 
        /* fill in values and test_run flag*/
-       udev_set_values(&udev, devpath, subsystem);
-       udev.test_run = 1;
+       udev_init_device(&udev, devpath, subsystem);
 
        /* 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 fake flag */
+       /* simulate node creation with test flag */
+       udev.test_run = 1;
        udev_add_device(&udev, class_dev);
 
-exit:
+       sysfs_close_class_device(class_dev);
+
        return 0;
 }