chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] more udev-016/extras/multipath
[elogind.git]
/
udev-remove.c
diff --git
a/udev-remove.c
b/udev-remove.c
index 0886c23343e0a7ee98fe8539cd130ff6783034ed..c21938fae77497843abe789c3743b87a5103c89c 100644
(file)
--- a/
udev-remove.c
+++ b/
udev-remove.c
@@
-31,9
+31,9
@@
#include "udev.h"
#include "udev_version.h"
#include "udev_dbus.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_dbus.h"
+#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
#include "namedev.h"
#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
static int delete_path(char *path)
{
static int delete_path(char *path)
{
@@
-73,7
+73,7
@@
static int delete_node(struct udevice *dev)
strncpy(filename, udev_root, sizeof(filename));
strncat(filename, dev->name, sizeof(filename));
strncpy(filename, udev_root, sizeof(filename));
strncat(filename, dev->name, sizeof(filename));
-
dbg("unlinking
node '%s'", filename);
+
info("removing device
node '%s'", filename);
retval = unlink(filename);
if (retval) {
dbg("unlink(%s) failed with error '%s'",
retval = unlink(filename);
if (retval) {
dbg("unlink(%s) failed with error '%s'",
@@
-118,23
+118,26
@@
static int delete_node(struct udevice *dev)
*/
int udev_remove_device(char *path, char *subsystem)
{
*/
int udev_remove_device(char *path, char *subsystem)
{
- char name[100];
- struct udevice *dev;
+ struct udevice dev;
char *temp;
char *temp;
+ int retval;
+
+ memset(&dev, 0, sizeof(dev));
-
dev = udevdb_get_dev(path
);
- if (
dev == NULL
) {
+
retval = udevdb_get_dev(path, &dev
);
+ if (
retval
) {
dbg("'%s' not found in database, falling back on default name", path);
temp = strrchr(path, '/');
if (temp == NULL)
return -ENODEV;
dbg("'%s' not found in database, falling back on default name", path);
temp = strrchr(path, '/');
if (temp == NULL)
return -ENODEV;
- strncpy(
name, &temp[1], sizeof(
name));
+ strncpy(
dev.name, &temp[1], sizeof(dev.
name));
}
}
- dbg("name is '%s'", dev
->
name);
+ dbg("name is '%s'", dev
.
name);
udevdb_delete_dev(path);
udevdb_delete_dev(path);
- sysbus_send_remove(name, path);
+ sysbus_send_remove(
dev.
name, path);
- return delete_node(dev);
+ retval = delete_node(&dev);
+ return retval;
}
}