udevadm: merge all udev tools into a single binary

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index f230b66628d1f473a04776222793c3d2ff9092ec..a36e503fd41112b339127022e04930f9943d181a 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -32,23 +32,6 @@
 #include "udev.h"
 #include "udev_rules.h"
 
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
-       va_list args;
-
-       if (priority > udev_log_priority)
-               return;
-
-       va_start(args, format);
-       vprintf(format, args);
-       va_end(args);
-       if (format[strlen(format)-1] != '\n')
-               printf("\n");
-}
-#endif
-
 static int import_uevent_var(const char *devpath)
 {
        char path[PATH_SIZE];
@@ -88,12 +71,12 @@ out:
        return rc;
 }
 
-int main(int argc, char *argv[], char *envp[])
+int udevtest(int argc, char *argv[], char *envp[])
 {
        int force = 0;
-       char *action = "add";
-       char *subsystem = NULL;
-       char *devpath = NULL;
+       const char *action = "add";
+       const char *subsystem = NULL;
+       const char *devpath = NULL;
        struct udevice *udev;
        struct sysfs_device *dev;
        struct udev_rules rules = {};
@@ -137,7 +120,7 @@ int main(int argc, char *argv[], char *envp[])
                        force = 1;
                        break;
                case 'h':
-                       printf("Usage: udevtest OPTIONS <devpath>\n"
+                       printf("Usage: udevadm test OPTIONS <devpath>\n"
                               "  --action=<string>     set action string\n"
                               "  --subsystem=<string>  set subsystem string\n"
                               "  --force               don't skip node/link creation\n"
@@ -211,6 +194,7 @@ int main(int argc, char *argv[], char *envp[])
                        info("run: '%s'", program);
                }
        }
+       udev_device_cleanup(udev);
 
 exit:
        udev_rules_cleanup(&rules);