Commit 71939319b45d00d1b9b31e53ac9b2249c7d7a36f
2014-02-15T14:53:36
Abstract out the _in_use function to take different linked lists.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/usbutils.c b/usbutils.c
index efe46e3..21bc653 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -1230,12 +1230,13 @@ static void in_use_get_ress(uint8_t bus_number, uint8_t device_address, void **r
(int)bus_number, (int)device_address);
}
-static bool __is_in_use(uint8_t bus_number, uint8_t device_address)
+static bool _in_use(struct usb_in_use_list *head, uint8_t bus_number,
+ uint8_t device_address)
{
struct usb_in_use_list *in_use_tmp;
bool ret = false;
- in_use_tmp = in_use_head;
+ in_use_tmp = head;
while (in_use_tmp) {
if (in_use_tmp->in_use.bus_number == (int)bus_number &&
in_use_tmp->in_use.device_address == (int)device_address) {
@@ -1243,24 +1244,21 @@ static bool __is_in_use(uint8_t bus_number, uint8_t device_address)
break;
}
in_use_tmp = in_use_tmp->next;
- if (in_use_tmp == in_use_head)
+ if (in_use_tmp == head)
break;
}
- in_use_tmp = blacklist_head;
- while (in_use_tmp) {
- if (in_use_tmp->in_use.bus_number == (int)bus_number &&
- in_use_tmp->in_use.device_address == (int)device_address) {
- ret = true;
- break;
- }
- in_use_tmp = in_use_tmp->next;
- if (in_use_tmp == blacklist_head)
- break;
- }
-
return ret;
}
+static bool __is_in_use(uint8_t bus_number, uint8_t device_address)
+{
+ if (_in_use(in_use_head, bus_number, device_address))
+ return true;
+ if (_in_use(blacklist_head, bus_number, device_address))
+ return true;
+ return false;
+}
+
static bool is_in_use_bd(uint8_t bus_number, uint8_t device_address)
{
bool ret;