slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Activity

common: Rework usage of connecting-to-device & add offline-report 

The former is logged as soon as we start probing, and cleared once
we've found the printer we care about.  The latter is only set
if we fail to find matching printer, and cleared otherwise
This commit is contained in:
Solomon Peachy 2021-09-29 22:56:44 -04:00
parent 87f3f39005
commit 3d6ff53559
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend_common.c
View File

@ -29,7 +29,7 @@
#include <signal.h>
#include <strings.h> /* For strncasecmp */
#define BACKEND_VERSION "0.118"
#define BACKEND_VERSION "0.119"
#ifndef CORRTABLE_PATH
#ifdef PACKAGE_DATA_DIR
@ -422,7 +422,6 @@ static int probe_device(struct libusb_device *device,
uint8_t endp_up, endp_down;
DEBUG("Probing VID: %04X PID: %04x\n", desc->idVendor, desc->idProduct);
STATE("+connecting-to-device\n");
if ((i = libusb_open(device, &dev))) {
#ifdef _WIN32
@ -721,8 +720,6 @@ abort:
free (dict[dlen].val);
}
STATE("-connecting-to-device\n");
return found;
}
@ -1470,13 +1467,17 @@ int main (int argc, char **argv)
}
/* Enumerate devices */
STATE("+connecting-to-device\n");
found = find_and_enumerate(argv0, ctx, &list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn);
if (found == -1) {
ERROR("Printer open failure (No matching printers found!)\n");
STATE("+offline-report");
ret = CUPS_BACKEND_RETRY;
goto done;
}
STATE("-offline-report");
if (test_mode) {
WARNING("**** TEST MODE %d!\n", test_mode);
@ -1521,6 +1522,8 @@ int main (int argc, char **argv)
}
bypass:
STATE("-connecting-to-device\n");
/* Initialize backend */
DEBUG("Initializing '%s' backend (version %s)\n",
backend->name, backend->version);
@ -1603,6 +1606,8 @@ done_close:
libusb_close(conn.dev);
done:
STATE("-connecting-to-device\n");
if (backend && backend_ctx) {
if (backend->teardown)
backend->teardown(backend_ctx);