canonselphy: Log the job type before the job/printer mismatch error.

This commit is contained in:
Solomon Peachy 2015-08-12 23:14:09 -04:00
parent de8a32424c
commit 0e91abe75d
1 changed files with 5 additions and 4 deletions

View File

@ -617,7 +617,7 @@ static int canonselphy_early_parse(void *vctx, int data_fd)
else else
printer_type = P_ES40; printer_type = P_ES40;
} }
/* Look up the printer entry */ /* Look up the printer entry */
for (i = 0; selphy_printers[i].type != -1; i++) { for (i = 0; selphy_printers[i].type != -1; i++) {
if (selphy_printers[i].type == printer_type) { if (selphy_printers[i].type == printer_type) {
@ -629,6 +629,9 @@ static int canonselphy_early_parse(void *vctx, int data_fd)
ERROR("Unrecognized printjob file format!\n"); ERROR("Unrecognized printjob file format!\n");
return -1; return -1;
} }
INFO("%sFile intended for a '%s' printer\n", ctx->bw_mode? "B/W " : "", ctx->printer->model);
if (ctx->printer->type != ctx->type) { if (ctx->printer->type != ctx->type) {
ERROR("Printer/Job mismatch (%d/%d)\n", ctx->type, ctx->printer->type); ERROR("Printer/Job mismatch (%d/%d)\n", ctx->type, ctx->printer->type);
return -1; return -1;
@ -640,8 +643,6 @@ static int canonselphy_early_parse(void *vctx, int data_fd)
else else
ctx->paper_code = -1; ctx->paper_code = -1;
INFO("%sFile intended for a '%s' printer\n", ctx->bw_mode? "B/W " : "", ctx->printer->model);
return printer_type; return printer_type;
} }
@ -656,7 +657,7 @@ static int canonselphy_read_parse(void *vctx, int data_fd)
/* Perform early parsing */ /* Perform early parsing */
i = canonselphy_early_parse(ctx, data_fd); i = canonselphy_early_parse(ctx, data_fd);
if (i < 0) if (i < 0)
return i; return CUPS_BACKEND_FAILED;
if (ctx->header) { if (ctx->header) {
free(ctx->header); free(ctx->header);