|
 |
6c5abd2 |
diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c
|
|
|
6c5abd2 |
index 6333408..b19668d 100644
|
|
|
6c5abd2 |
--- a/src/cups/backend_common.c
|
|
|
6c5abd2 |
+++ b/src/cups/backend_common.c
|
|
|
6c5abd2 |
@@ -753,8 +753,7 @@ static struct dyesub_backend *backends[] = {
|
|
|
6c5abd2 |
NULL,
|
|
|
6c5abd2 |
};
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
-static int find_and_enumerate(struct libusb_context *ctx,
|
|
|
6c5abd2 |
- struct libusb_device ***list,
|
|
|
6c5abd2 |
+static int find_and_enumerate(struct libusb_device ***list,
|
|
|
6c5abd2 |
const struct dyesub_backend *backend,
|
|
|
6c5abd2 |
const char *match_serno,
|
|
|
6c5abd2 |
const char *make,
|
|
|
6c5abd2 |
@@ -777,7 +776,7 @@ static int find_and_enumerate(struct libusb_context *ctx,
|
|
|
6c5abd2 |
STATE("+org.gutenprint.searching-for-device\n");
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
/* Enumerate and find suitable device */
|
|
|
6c5abd2 |
- num = libusb_get_device_list(ctx, list);
|
|
|
6c5abd2 |
+ num = libusb_get_device_list(NULL, list);
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
/* See if we can actually match on the supplied make! */
|
|
|
6c5abd2 |
if (backend && make) {
|
|
|
6c5abd2 |
@@ -1010,7 +1009,6 @@ along with this program; if not, see <https://www.gnu.org/licenses/>.\n\n";
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
void print_help(const char *argv0, const struct dyesub_backend *backend)
|
|
|
6c5abd2 |
{
|
|
|
6c5abd2 |
- struct libusb_context *ctx = NULL;
|
|
|
6c5abd2 |
struct libusb_device **list = NULL;
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
const char *ptr = getenv("BACKEND");
|
|
|
6c5abd2 |
@@ -1072,7 +1070,7 @@ void print_help(const char *argv0, const struct dyesub_backend *backend)
|
|
|
6c5abd2 |
}
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
/* Scan for all printers for the specified backend */
|
|
|
6c5abd2 |
- find_and_enumerate(ctx, &list, backend, NULL, ptr, 1, 1, NULL);
|
|
|
6c5abd2 |
+ find_and_enumerate(&list, backend, NULL, ptr, 1, 1, NULL);
|
|
|
6c5abd2 |
libusb_free_device_list(list, 1);
|
|
|
6c5abd2 |
}
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
@@ -1251,7 +1249,6 @@ done:
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
int main (int argc, char **argv)
|
|
|
6c5abd2 |
{
|
|
|
6c5abd2 |
- struct libusb_context *ctx = NULL;
|
|
|
6c5abd2 |
struct libusb_device **list = NULL;
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
struct dyesub_backend *backend = NULL;
|
|
|
6c5abd2 |
@@ -1414,7 +1411,7 @@ int main (int argc, char **argv)
|
|
|
6c5abd2 |
#endif
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
/* Libusb setup */
|
|
|
6c5abd2 |
- ret = libusb_init(&ctx;;
|
|
|
6c5abd2 |
+ ret = libusb_init(NULL);
|
|
|
6c5abd2 |
if (ret) {
|
|
|
6c5abd2 |
ERROR("Failed to initialize libusb (%d)\n", ret);
|
|
|
6c5abd2 |
ret = CUPS_BACKEND_RETRY_CURRENT;
|
|
|
6c5abd2 |
@@ -1438,7 +1435,7 @@ int main (int argc, char **argv)
|
|
|
6c5abd2 |
}
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
/* Enumerate devices */
|
|
|
6c5abd2 |
- found = find_and_enumerate(ctx, &list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn;;
|
|
|
6c5abd2 |
+ found = find_and_enumerate(&list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn;;
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
if (found == -1) {
|
|
|
6c5abd2 |
ERROR("Printer open failure (No matching printers found!)\n");
|
|
|
6c5abd2 |
@@ -1572,7 +1569,7 @@ done:
|
|
|
6c5abd2 |
if (list)
|
|
|
6c5abd2 |
libusb_free_device_list(list, 1);
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
- libusb_exit(ctx);
|
|
|
6c5abd2 |
+ libusb_exit(NULL);
|
|
|
6c5abd2 |
|
|
|
6c5abd2 |
return ret;
|
|
|
6c5abd2 |
}
|