[PATCH] remove dbus code from core udev code as it's no longer needed to be there.

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 93adcc7806fe0d1c2211838c4b259297960fa5d8..41636b684e265120897e4233658feb4120b3de22 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,8 +29,8 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -72,7 +72,8 @@ static int delete_node(struct udevice *dev)
        char partitionname[NAME_SIZE];
        int retval;
        int i;
-       int pos, len;
+       char *pos;
+       int len;
 
        strfieldcpy(filename, udev_root);
        strfieldcat(filename, dev->name);
@@ -102,7 +103,7 @@ static int delete_node(struct udevice *dev)
                delete_path(filename);
 
        foreach_strpart(dev->symlink, " ", pos, len) {
-               strnfieldcpy(linkname, dev->symlink + pos, len+1);
+               strfieldcpymax(linkname, pos, len+1);
                strfieldcpy(filename, udev_root);
                strfieldcat(filename, linkname);
 
@@ -148,7 +149,7 @@ int udev_remove_device(char *path, char *subsystem)
        dbg("name is '%s'", dev.name);
        udevdb_delete_dev(path);
 
-       sysbus_send_remove(dev.name, path);
+       dev_d_send(&dev, subsystem);
 
        retval = delete_node(&dev);
        return retval;