Attachment 139494 Details for Bug 106279 – lib: Rename USB-specific discovery functions

[patch] lib: Rename USB-specific discovery functions

lib-Rename-USB-specific-discovery-functions.patch (text/plain), 1.93 KB, created by Bastien Nocera on 2018-05-11 09:12:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2018-05-11 09:12:19 UTC

Size: 1.93 KB

patch

obsolete

>From e5fb289d796adee810a5668e8309027e820a7df1 Mon Sep 17 00:00:00 2001
>From: Bastien Nocera <hadess@hadess.net>
>Date: Thu, 26 Apr 2018 16:29:26 +0200
>Subject: [PATCH] lib: Rename USB-specific discovery functions
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106279
>---
> libfprint/core.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/libfprint/core.c b/libfprint/core.c
>index fc5b94b..d5a9572 100644
>--- a/libfprint/core.c
>+++ b/libfprint/core.c
>@@ -442,7 +442,7 @@ API_EXPORTED struct fp_driver **fprint_get_drivers (void)
> 	return (struct fp_driver **) g_ptr_array_free (array, FALSE);
> }
> 
>-static struct fp_driver *find_supporting_driver(libusb_device *udev,
>+static struct fp_driver *find_supporting_usb_driver(libusb_device *udev,
> 	const struct usb_id **usb_id, uint32_t *devtype)
> {
> 	int ret;
>@@ -510,14 +510,14 @@ static struct fp_driver *find_supporting_driver(libusb_device *udev,
> 	return best_drv;
> }
> 
>-static struct fp_dscv_dev *discover_dev(libusb_device *udev)
>+static struct fp_dscv_dev *discover_usb_dev(libusb_device *udev)
> {
> 	const struct usb_id *usb_id;
> 	struct fp_driver *drv;
> 	struct fp_dscv_dev *ddev;
> 	uint32_t devtype;
> 
>-	drv = find_supporting_driver(udev, &usb_id, &devtype);
>+	drv = find_supporting_usb_driver(udev, &usb_id, &devtype);
> 
> 	if (!drv)
> 		return NULL;
>@@ -559,10 +559,10 @@ API_EXPORTED struct fp_dscv_dev **fp_discover_devs(void)
> 	/* Check each device against each driver, temporarily storing successfully
> 	 * discovered devices in a GPtrArray. */
> 	while ((udev = devs[i++]) != NULL) {
>-		struct fp_dscv_dev *ddev = discover_dev(udev);
>+		struct fp_dscv_dev *ddev = discover_usb_dev(udev);
> 		if (!ddev)
> 			continue;
>-		/* discover_dev() doesn't hold a reference to the udev,
>+		/* discover_usb_dev() doesn't hold a reference to the udev,
> 		 * so increase the reference for ddev to hold this ref */
> 		libusb_ref_device(udev);
> 		g_ptr_array_add (tmparray, (gpointer) ddev);
>-- 
>2.17.0

Actions: View | Splinter Review

Attachments on bug 106279: 139168 | 139169 | 139170 | 139174 | 139492 | 139493 | 139494 | 139495

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.