summaryrefslogtreecommitdiff
path: root/udev-remove.c
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-12-08 09:40:40 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:06 -0700
commit7ac0feeb6044470569d7ece5d34a76acdb03fc64 (patch)
tree0739df0c77486dfdf34a486a662ff62967240dae /udev-remove.c
parent5aebfbcb62614fc2bf2b1579d62e3fe272c6751a (diff)
[PATCH] move all of the DBUS logic into one file and remove all of the #ifdef crud from the main code.
Diffstat (limited to 'udev-remove.c')
-rw-r--r--udev-remove.c43
1 files changed, 3 insertions, 40 deletions
diff --git a/udev-remove.c b/udev-remove.c
index 307b907c88..02c84371a4 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -30,6 +30,7 @@
#include "udev.h"
#include "udev_version.h"
+#include "udev_dbus.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
@@ -100,42 +101,6 @@ static int delete_node(struct udevice *dev)
return retval;
}
-#ifdef USE_DBUS
-/** Send out a signal that a device node is deleted
- *
- * @param name Name of the device node, e.g. /udev/sda1
- * @param path Sysfs path of device
- */
-static void sysbus_send_remove(const char* name, const char *path)
-{
- char filename[255];
- DBusMessage* message;
- DBusMessageIter iter;
-
- if (sysbus_connection == NULL)
- return;
-
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, name, sizeof(filename));
-
- /* object, interface, member */
- message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor",
- "org.kernel.udev.NodeMonitor",
- "NodeDeleted");
-
- dbus_message_iter_init(message, &iter);
- dbus_message_iter_append_string(&iter, filename);
- dbus_message_iter_append_string(&iter, path);
-
- if ( !dbus_connection_send(sysbus_connection, message, NULL) )
- dbg("error sending d-bus signal");
-
- dbus_message_unref(message);
-
- dbus_connection_flush(sysbus_connection);
-}
-#endif /* USE_DBUS */
-
/*
* Look up the sysfs path in the database to see if we have named this device
* something different from the kernel name. If we have, us it. If not, use
@@ -159,9 +124,7 @@ int udev_remove_device(char *path, char *subsystem)
dbg("name is '%s'", dev->name);
udevdb_delete_dev(path);
-#ifdef USE_DBUS
- sysbus_send_remove(name, device);
-#endif /* USE_DBUS */
-
+ sysbus_send_remove(name, path);
+
return delete_node(dev);
}