[PATCH] udevd race conditions and performance, assorted cleanups

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index 08212dfee62552cfb8c6bb3edc825c75a707e0b9..f1c46d33672e918bb548c798a84265e65b51390a 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -36,12 +36,13 @@
 #include <linux/stddef.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -52,30 +53,6 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
 static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
                            char *devpath, char *subsystem, int seqnum)
 {
@@ -144,7 +121,7 @@ int main(int argc, char* argv[])
 #endif
        dbg("version %s", UDEV_VERSION);
 
-       subsystem = argv[1];
+       subsystem = get_subsystem(argv[1]);
        if (subsystem == NULL) {
                dbg("no subsystem");
                goto exit;