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] major database cleanups
[elogind.git]
/
udev-remove.c
diff --git
a/udev-remove.c
b/udev-remove.c
index 430f1c901e316592f6ab7dc1af0eee196c1d7dad..c61a948fa0b179ba987063d922995f703b5cc3c5 100644
(file)
--- a/
udev-remove.c
+++ b/
udev-remove.c
@@
-40,15
+40,20
@@
* something different from the kernel name. If we have, us it. If not, use
* the default kernel name for lack of anything else to know to do.
*/
* something different from the kernel name. If we have, us it. If not, use
* the default kernel name for lack of anything else to know to do.
*/
-static char *get_name(char *
dev
, int major, int minor)
+static char *get_name(char *
path
, int major, int minor)
{
static char name[100];
{
static char name[100];
+ struct udevice *dev;
char *temp;
char *temp;
- if (udevdb_get_dev(dev, &name[0], sizeof(name)) == 0)
+ dev = udevdb_get_dev(path);
+ if (dev != NULL) {
+ strcpy(name, dev->name);
goto exit;
goto exit;
+ }
- temp = strrchr(dev, '/');
+ dbg("%s not found in database, falling back on default name", path);
+ temp = strrchr(path, '/');
if (temp == NULL)
return NULL;
strncpy(name, &temp[1], sizeof(name));
if (temp == NULL)
return NULL;
strncpy(name, &temp[1], sizeof(name));
@@
-84,7
+89,6
@@
int udev_remove_device(char *device, char *subsystem)
goto exit;
}
goto exit;
}
- udevdb_delete_udevice(name);
udevdb_delete_dev(device);
return delete_node(name);
udevdb_delete_dev(device);
return delete_node(name);