summaryrefslogtreecommitdiff
path: root/libudev
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-04-13 12:45:38 +0200
committerKay Sievers <kay.sievers@vrfy.org>2010-04-13 12:45:38 +0200
commita89d342dfb45b54e29381af9dbc495bbb2b057af (patch)
tree2ad834ff82007c3ebcbb6b884a45a2ce26a93ac1 /libudev
parent06ba47d8336c6d017a67d11f480341db07b9bc4b (diff)
remove "ignore_remove" option
Diffstat (limited to 'libudev')
-rw-r--r--libudev/libudev-device-private.c4
-rw-r--r--libudev/libudev-device.c17
-rw-r--r--libudev/libudev-private.h2
3 files changed, 0 insertions, 23 deletions
diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 19c20b2cc8..5e4381ec27 100644
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -41,8 +41,6 @@ int udev_device_update_db(struct udev_device *udev_device)
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device))
if (udev_list_entry_get_flags(list_entry))
goto file;
- if (udev_device_get_ignore_remove(udev_device))
- goto file;
if (udev_device_get_devlink_priority(udev_device) != 0)
goto file;
if (udev_device_get_event_timeout(udev_device) >= 0)
@@ -93,8 +91,6 @@ file:
fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
if (udev_device_get_event_timeout(udev_device) >= 0)
fprintf(f, "T:%i\n", udev_device_get_event_timeout(udev_device));
- if (udev_device_get_ignore_remove(udev_device))
- fprintf(f, "R:%i\n", udev_device_get_ignore_remove(udev_device));
if (udev_device_get_watch_handle(udev_device) >= 0)
fprintf(f, "W:%i\n", udev_device_get_watch_handle(udev_device));
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index 75cc61c5fc..b3b6a63114 100644
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -75,7 +75,6 @@ struct udev_device {
unsigned int envp_uptodate:1;
unsigned int driver_set:1;
unsigned int info_loaded:1;
- unsigned int ignore_remove:1;
};
struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
@@ -283,9 +282,6 @@ int udev_device_read_db(struct udev_device *udev_device)
case 'T':
udev_device_set_event_timeout(udev_device, atoi(val));
break;
- case 'R':
- udev_device_set_ignore_remove(udev_device, atoi(val));
- break;
case 'E':
udev_device_add_property_from_string(udev_device, val);
break;
@@ -1434,19 +1430,6 @@ int udev_device_set_devlink_priority(struct udev_device *udev_device, int prio)
return 0;
}
-int udev_device_get_ignore_remove(struct udev_device *udev_device)
-{
- if (!udev_device->info_loaded)
- device_load_info(udev_device);
- return udev_device->ignore_remove;
-}
-
-int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore)
-{
- udev_device->ignore_remove = ignore;
- return 0;
-}
-
int udev_device_get_watch_handle(struct udev_device *udev_device)
{
if (!udev_device->info_loaded)
diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index bf9e923b6d..8dc469ec9b 100644
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -95,8 +95,6 @@ int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum);
int udev_device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum);
int udev_device_get_devlink_priority(struct udev_device *udev_device);
int udev_device_set_devlink_priority(struct udev_device *udev_device, int prio);
-int udev_device_get_ignore_remove(struct udev_device *udev_device);
-int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore);
int udev_device_get_watch_handle(struct udev_device *udev_device);
int udev_device_set_watch_handle(struct udev_device *udev_device, int handle);
void udev_device_set_info_loaded(struct udev_device *device);