X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=scheduler%2Fipp.c;h=12c097374f3aafc64d2dec14a08d62b28cec29f0;hp=50b1691957e9f5880f6ba81ed923b025f882d8eb;hb=4d301e694f72b03ab2b6c8189387bd7076a3a2ea;hpb=b226ab99134159fff1c3192d3bf22d2652db386b diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 50b169195..12c097374 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -291,7 +291,7 @@ cupsdProcessIPPRequest( con->request->request.any.version[1]); send_ipp_status(con, IPP_VERSION_NOT_SUPPORTED, - _("Bad request version number %d.%d!"), + _("Bad request version number %d.%d"), con->request->request.any.version[0], con->request->request.any.version[1]); } @@ -306,7 +306,7 @@ cupsdProcessIPPRequest( IPP_BAD_REQUEST, con->http.hostname, con->request->request.any.request_id); - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad request ID %d!"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad request ID %d"), con->request->request.any.request_id); } else if (!con->request->attrs) @@ -315,7 +315,7 @@ cupsdProcessIPPRequest( "%04X %s No attributes in request", IPP_BAD_REQUEST, con->http.hostname); - send_ipp_status(con, IPP_BAD_REQUEST, _("No attributes in request!")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No attributes in request")); } else { @@ -338,7 +338,7 @@ cupsdProcessIPPRequest( IPP_BAD_REQUEST, con->http.hostname); send_ipp_status(con, IPP_BAD_REQUEST, - _("Attribute groups are out of order (%x < %x)!"), + _("Attribute groups are out of order (%x < %x)"), attr->group_tag, group); break; } @@ -408,14 +408,14 @@ cupsdProcessIPPRequest( * Bad character set... */ - cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"!", + cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"", charset->values[0].string.text); cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Unsupported attributes-charset value \"%s\"", IPP_CHARSET, con->http.hostname, charset->values[0].string.text); send_ipp_status(con, IPP_BAD_REQUEST, - _("Unsupported character set \"%s\"!"), + _("Unsupported character set \"%s\""), charset->values[0].string.text); } else if (!charset || !language || @@ -435,7 +435,7 @@ cupsdProcessIPPRequest( if (!charset) { cupsdLogMessage(CUPSD_LOG_ERROR, - "Missing attributes-charset attribute!"); + "Missing attributes-charset attribute"); cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Missing attributes-charset attribute", @@ -445,7 +445,7 @@ cupsdProcessIPPRequest( if (!language) { cupsdLogMessage(CUPSD_LOG_ERROR, - "Missing attributes-natural-language attribute!"); + "Missing attributes-natural-language attribute"); cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Missing attributes-natural-language attribute", @@ -456,7 +456,7 @@ cupsdProcessIPPRequest( { cupsdLogMessage(CUPSD_LOG_ERROR, "Missing printer-uri, job-uri, or ppd-name " - "attribute!"); + "attribute"); cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Missing printer-uri, job-uri, or ppd-name " @@ -474,7 +474,7 @@ cupsdProcessIPPRequest( cupsdLogMessage(CUPSD_LOG_DEBUG, "End of attributes..."); send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing required attributes!")); + _("Missing required attributes")); } else { @@ -698,7 +698,7 @@ cupsdProcessIPPRequest( ippOpString(con->request->request.op.operation_id)); send_ipp_status(con, IPP_OPERATION_NOT_SUPPORTED, - _("%s not supported!"), + _("%s not supported"), ippOpString( con->request->request.op.operation_id)); break; @@ -1010,7 +1010,7 @@ add_class(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("A printer named \"%s\" already exists!"), + _("A printer named \"%s\" already exists"), resource + 9); return; } @@ -1132,7 +1132,7 @@ add_class(cupsd_client_t *con, /* I - Client connection */ attr->values[0].integer != IPP_PRINTER_STOPPED) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Attempt to set %s printer-state to bad value %d!"), + _("Attempt to set %s printer-state to bad value %d"), pclass->name, attr->values[0].integer); return; } @@ -1193,7 +1193,7 @@ add_class(cupsd_client_t *con, /* I - Client connection */ else if (dtype & CUPS_PRINTER_CLASS) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Nested classes are not allowed!")); + _("Nested classes are not allowed")); return; } @@ -1299,7 +1299,7 @@ add_file(cupsd_client_t *con, /* I - Connection to client */ if (con) send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to allocate memory for file types!")); + _("Unable to allocate memory for file types")); return (-1); } @@ -1354,7 +1354,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ strcasecmp(con->http.hostname, ServerName)) { send_ipp_status(con, IPP_NOT_AUTHORIZED, - _("The printer or class is not shared!")); + _("The printer or class is not shared")); return (NULL); } @@ -1417,7 +1417,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ filetype->type); send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s\'!"), mimetype); + _("Unsupported format \'%s\'"), mimetype); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE, "document-format", NULL, mimetype); @@ -1444,14 +1444,14 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if (attr->value_tag != IPP_TAG_KEYWORD && attr->value_tag != IPP_TAG_NAME) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value type!")); + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value type")); return (NULL); } if (attr->num_values > 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Too many job-sheets values (%d > 2)!"), + _("Too many job-sheets values (%d > 2)"), attr->num_values); return (NULL); } @@ -1460,7 +1460,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if (strcmp(attr->values[i].string.text, "none") && !cupsdFindBanner(attr->values[i].string.text)) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value \"%s\"!"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value \"%s\""), attr->values[i].string.text); return (NULL); } @@ -1557,7 +1557,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to add job for destination \"%s\"!"), + _("Unable to add job for destination \"%s\""), printer->name); return (NULL); } @@ -2089,7 +2089,7 @@ add_job_subscriptions( resource, sizeof(resource)) < HTTP_URI_OK) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-recipient-uri URI \"%s\"!"), recipient); + _("Bad notify-recipient-uri URI \"%s\""), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -2101,7 +2101,7 @@ add_job_subscriptions( { send_ipp_status(con, IPP_NOT_POSSIBLE, _("notify-recipient-uri URI \"%s\" uses unknown " - "scheme!"), recipient); + "scheme"), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -2110,7 +2110,7 @@ add_job_subscriptions( if (!strcmp(scheme, "rss") && !check_rss_recipient(recipient)) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("notify-recipient-uri URI \"%s\" is already used!"), + _("notify-recipient-uri URI \"%s\" is already used"), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); @@ -2125,7 +2125,7 @@ add_job_subscriptions( if (strcmp(pullmethod, "ippget")) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-pull-method \"%s\"!"), pullmethod); + _("Bad notify-pull-method \"%s\""), pullmethod); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); return; @@ -2137,7 +2137,7 @@ add_job_subscriptions( strcmp(attr->values[0].string.text, "utf-8")) { send_ipp_status(con, IPP_CHARSET, - _("Character set \"%s\" not supported!"), + _("Character set \"%s\" not supported"), attr->values[0].string.text); return; } @@ -2146,7 +2146,7 @@ add_job_subscriptions( strcmp(attr->values[0].string.text, DefaultLanguage))) { send_ipp_status(con, IPP_CHARSET, - _("Language \"%s\" not supported!"), + _("Language \"%s\" not supported"), attr->values[0].string.text); return; } @@ -2157,7 +2157,7 @@ add_job_subscriptions( { send_ipp_status(con, IPP_REQUEST_VALUE, _("The notify-user-data value is too large " - "(%d > 63 octets)!"), + "(%d > 63 octets)"), attr->values[0].unknown.length); return; } @@ -2387,7 +2387,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("A class named \"%s\" already exists!"), + _("A class named \"%s\" already exists"), resource + 10); return; } @@ -2506,7 +2506,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (uri_status < HTTP_URI_OK) { - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"!"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\""), attr->values[0].string.text); cupsdLogMessage(CUPSD_LOG_DEBUG, "add_printer: httpSeparateURI returned %d", uri_status); @@ -2546,7 +2546,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ * Could not find device in list! */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri scheme \"%s\"!"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri scheme \"%s\""), scheme); return; } @@ -2590,7 +2590,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (!supported || i >= supported->num_values) { - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\"!"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\""), attr->values[0].string.text); return; } @@ -2638,7 +2638,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (attr->values[0].integer != IPP_PRINTER_IDLE && attr->values[0].integer != IPP_PRINTER_STOPPED) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d!"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d"), attr->values[0].integer); return; } @@ -2670,7 +2670,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ (int)(sizeof(printer->reasons) / sizeof(printer->reasons[0]))) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Too many printer-state-reasons values (%d > %d)!"), + _("Too many printer-state-reasons values (%d > %d)"), attr->num_values, (int)(sizeof(printer->reasons) / sizeof(printer->reasons[0]))); @@ -2764,13 +2764,13 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (copy_file(srcfile, dstfile)) { send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to copy interface script - %s!"), + _("Unable to copy interface script - %s"), strerror(errno)); return; } cupsdLogMessage(CUPSD_LOG_DEBUG, - "Copied interface script successfully!"); + "Copied interface script successfully"); chmod(dstfile, 0755); } @@ -2787,13 +2787,13 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (copy_file(srcfile, dstfile)) { send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to copy PPD file - %s!"), + _("Unable to copy PPD file - %s"), strerror(errno)); return; } cupsdLogMessage(CUPSD_LOG_DEBUG, - "Copied PPD file successfully!"); + "Copied PPD file successfully"); chmod(dstfile, 0644); } else @@ -2842,12 +2842,12 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (copy_model(con, attr->values[0].string.text, dstfile)) { - send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file!")); + send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file")); return; } cupsdLogMessage(CUPSD_LOG_DEBUG, - "Copied PPD file successfully!"); + "Copied PPD file successfully"); chmod(dstfile, 0644); } } @@ -3277,7 +3277,7 @@ apple_register_profiles( if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL) { cupsdLogMessage(CUPSD_LOG_ERROR, - "Unable to allocate memory for %d profiles!", + "Unable to allocate memory for %d profiles", num_profiles); ppdClose(ppd); return; @@ -3384,7 +3384,7 @@ apple_register_profiles( if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL) { cupsdLogMessage(CUPSD_LOG_ERROR, - "Unable to allocate memory for %d profiles!", + "Unable to allocate memory for %d profiles", num_profiles); ppdClose(ppd); return; @@ -3432,7 +3432,7 @@ apple_register_profiles( if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL) { cupsdLogMessage(CUPSD_LOG_ERROR, - "Unable to allocate memory for %d profiles!", + "Unable to allocate memory for %d profiles", num_profiles); ppdClose(ppd); return; @@ -3643,7 +3643,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -3665,7 +3665,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri attribute \"%s\"!"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -3684,7 +3684,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("Job #%d does not exist!"), jobid); + _("Job #%d does not exist"), jobid); return; } @@ -3699,7 +3699,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d is not held for authentication!"), + _("Job #%d is not held for authentication"), jobid); return; } @@ -3727,7 +3727,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ send_http_error(con, HTTP_UNAUTHORIZED, printer); else send_ipp_status(con, IPP_NOT_AUTHORIZED, - _("No authentication information provided!")); + _("No authentication information provided")); return; } @@ -3803,7 +3803,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ if (strcmp(uri->name, "printer-uri")) { send_ipp_status(con, IPP_BAD_REQUEST, - _("The printer-uri attribute is required!")); + _("The printer-uri attribute is required")); return; } @@ -3822,7 +3822,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ else { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing requesting-user-name attribute!")); + _("Missing requesting-user-name attribute")); return; } } @@ -3949,7 +3949,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -4000,7 +4000,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ jobid = job->id; else { - send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s!"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s"), printer->name); return; } @@ -4024,7 +4024,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -4052,7 +4052,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -4147,7 +4147,7 @@ cancel_subscription( */ send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good!"), sub_id); + _("notify-subscription-id %d no good"), sub_id); return; } @@ -4481,7 +4481,7 @@ check_quotas(cupsd_client_t *con, /* I - Client connection */ if ((q = cupsdUpdateQuota(p, username, 0, 0)) == NULL) { cupsdLogMessage(CUPSD_LOG_ERROR, - "Unable to allocate quota data for user \"%s\"!", + "Unable to allocate quota data for user \"%s\"", username); return (-1); } @@ -5207,7 +5207,7 @@ copy_model(cupsd_client_t *con, /* I - Client connection */ * No data from cups-deviced... */ - cupsdLogMessage(CUPSD_LOG_ERROR, "copy_model: empty PPD file!"); + cupsdLogMessage(CUPSD_LOG_ERROR, "copy_model: empty PPD file"); unlink(tempfile); return (-1); } @@ -6105,7 +6105,7 @@ create_subscription( if (!attr) { send_ipp_status(con, IPP_BAD_REQUEST, - _("No subscription attributes in request!")); + _("No subscription attributes in request")); return; } @@ -6163,7 +6163,7 @@ create_subscription( resource, sizeof(resource)) < HTTP_URI_OK) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-recipient-uri URI \"%s\"!"), recipient); + _("Bad notify-recipient-uri URI \"%s\""), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -6175,7 +6175,7 @@ create_subscription( { send_ipp_status(con, IPP_NOT_POSSIBLE, _("notify-recipient-uri URI \"%s\" uses unknown " - "scheme!"), recipient); + "scheme"), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -6184,7 +6184,7 @@ create_subscription( if (!strcmp(scheme, "rss") && !check_rss_recipient(recipient)) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("notify-recipient-uri URI \"%s\" is already used!"), + _("notify-recipient-uri URI \"%s\" is already used"), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); @@ -6199,7 +6199,7 @@ create_subscription( if (strcmp(pullmethod, "ippget")) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-pull-method \"%s\"!"), pullmethod); + _("Bad notify-pull-method \"%s\""), pullmethod); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); return; @@ -6211,7 +6211,7 @@ create_subscription( strcmp(attr->values[0].string.text, "utf-8")) { send_ipp_status(con, IPP_CHARSET, - _("Character set \"%s\" not supported!"), + _("Character set \"%s\" not supported"), attr->values[0].string.text); return; } @@ -6220,7 +6220,7 @@ create_subscription( strcmp(attr->values[0].string.text, DefaultLanguage))) { send_ipp_status(con, IPP_CHARSET, - _("Language \"%s\" not supported!"), + _("Language \"%s\" not supported"), attr->values[0].string.text); return; } @@ -6231,7 +6231,7 @@ create_subscription( { send_ipp_status(con, IPP_REQUEST_VALUE, _("The notify-user-data value is too large " - "(%d > 63 octets)!"), + "(%d > 63 octets)"), attr->values[0].unknown.length); return; } @@ -6279,7 +6279,7 @@ create_subscription( else { send_ipp_status(con, IPP_BAD_REQUEST, - _("notify-events not specified!")); + _("notify-events not specified")); return; } } @@ -6297,7 +6297,7 @@ create_subscription( { if ((job = cupsdFindJob(jobid)) == NULL) { - send_ipp_status(con, IPP_NOT_FOUND, _("Job %d not found!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job %d not found"), jobid); return; } } @@ -6629,7 +6629,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -6652,7 +6652,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -6670,7 +6670,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -6692,7 +6692,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing document-number attribute!")); + _("Missing document-number attribute")); return; } @@ -6712,7 +6712,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ "Unable to open document %d in job %d - %s", docnum, jobid, strerror(errno)); send_ipp_status(con, IPP_NOT_FOUND, - _("Unable to open document %d in job %d!"), docnum, jobid); + _("Unable to open document %d in job %d"), docnum, jobid); return; } @@ -6771,7 +6771,7 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -6794,7 +6794,7 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -6812,7 +6812,7 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -6877,7 +6877,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ if (strcmp(uri->name, "printer-uri")) { - send_ipp_status(con, IPP_BAD_REQUEST, _("No printer-uri in request!")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No printer-uri in request")); return; } @@ -7037,7 +7037,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ if (!job->attrs) { - cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: No attributes for job %d!", + cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: No attributes for job %d", job->id); continue; } @@ -7092,7 +7092,7 @@ get_notifications(cupsd_client_t *con) /* I - Client connection */ if (!ids) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing notify-subscription-ids attribute!")); + _("Missing notify-subscription-ids attribute")); return; } @@ -7109,7 +7109,7 @@ get_notifications(cupsd_client_t *con) /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good!"), + _("notify-subscription-id %d no good"), ids->values[i].integer); return; } @@ -7815,7 +7815,7 @@ get_subscription_attrs( */ send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good!"), sub_id); + _("notify-subscription-id %d no good"), sub_id); return; } @@ -7901,7 +7901,7 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ if (!job) { - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%s does not exist!"), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%s does not exist"), resource + 6); return; } @@ -7923,7 +7923,7 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ if (!job) { - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), attr->values[0].integer); return; } @@ -8046,7 +8046,7 @@ hold_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -8069,7 +8069,7 @@ hold_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -8087,7 +8087,7 @@ hold_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -8234,7 +8234,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("job-printer-uri attribute missing!")); + _("job-printer-uri attribute missing")); return; } @@ -8297,7 +8297,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("Job #%d does not exist!"), attr->values[0].integer); + _("Job #%d does not exist"), attr->values[0].integer); return; } else @@ -8324,7 +8324,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -8342,7 +8342,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("Job #%d does not exist!"), jobid); + _("Job #%d does not exist"), jobid); return; } else @@ -8384,7 +8384,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d is finished and cannot be altered!"), + _("Job #%d is finished and cannot be altered"), job->id); return; } @@ -8569,7 +8569,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ ) { send_ipp_status(con, IPP_ATTRIBUTES, - _("Unsupported compression \"%s\"!"), + _("Unsupported compression \"%s\""), attr->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD, "compression", NULL, attr->values[0].string.text); @@ -8588,7 +8588,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ if (!con->filename) { - send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?!")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?")); return; } @@ -8622,7 +8622,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Could not scan type \"%s\"!"), + _("Could not scan type \"%s\""), format->values[0].string.text); return; } @@ -8638,7 +8638,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Could not scan type \"%s\"!"), + _("Could not scan type \"%s\""), default_format); return; } @@ -8703,7 +8703,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ else if (!filetype) { send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s/%s\'!"), super, type); + _("Unsupported format \'%s/%s\'"), super, type); cupsdLogMessage(CUPSD_LOG_INFO, "Hint: Do you have the raw file printing rules enabled?"); @@ -9149,7 +9149,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -9172,7 +9172,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -9190,7 +9190,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -9204,7 +9204,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not possible" error... */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not held!"), jobid); + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not held"), jobid); return; } @@ -9284,7 +9284,7 @@ renew_subscription( */ send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good!"), sub_id); + _("notify-subscription-id %d no good"), sub_id); return; } @@ -9295,7 +9295,7 @@ renew_subscription( */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job subscriptions cannot be renewed!")); + _("Job subscriptions cannot be renewed")); return; } @@ -9375,7 +9375,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -9398,7 +9398,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -9416,7 +9416,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -9430,7 +9430,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not possible" error... */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not complete!"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not complete"), jobid); return; } @@ -9448,7 +9448,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d cannot be restarted - no files!"), jobid); + _("Job #%d cannot be restarted - no files"), jobid); return; } @@ -9730,7 +9730,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -9753,7 +9753,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -9771,7 +9771,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -9804,7 +9804,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ #endif /* HAVE_LIBZ */ ) { - send_ipp_status(con, IPP_ATTRIBUTES, _("Unsupported compression \"%s\"!"), + send_ipp_status(con, IPP_ATTRIBUTES, _("Unsupported compression \"%s\""), attr->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD, "compression", NULL, attr->values[0].string.text); @@ -9823,7 +9823,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ if (!con->filename) { - send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?!")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?")); return; } @@ -9841,7 +9841,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"!"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\""), format->values[0].string.text); return; } @@ -9857,7 +9857,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Could not scan type \"%s\"!"), + _("Could not scan type \"%s\""), default_format); return; } @@ -9921,7 +9921,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ else if (!filetype) { send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s/%s\'!"), super, type); + _("Unsupported format \'%s/%s\'"), super, type); cupsdLogMessage(CUPSD_LOG_INFO, "Hint: Do you have the raw file printing rules enabled?"); @@ -9938,7 +9938,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ filetype->type); send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s\'!"), mimetype); + _("Unsupported format \'%s\'"), mimetype); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE, "document-format", NULL, mimetype); @@ -10306,7 +10306,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id!")); + _("Got a printer-uri attribute but no job-id")); return; } @@ -10329,7 +10329,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\"!"), + _("Bad job-uri attribute \"%s\""), uri->values[0].string.text); return; } @@ -10347,7 +10347,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); return; } @@ -10362,7 +10362,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d is finished and cannot be altered!"), jobid); + _("Job #%d is finished and cannot be altered"), jobid); return; } @@ -10437,7 +10437,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ if (attr->value_tag != IPP_TAG_INTEGER) { - send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-priority value!")); + send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-priority value")); if ((attr2 = copy_attribute(con->response, attr, 0)) != NULL) attr2->group_tag = IPP_TAG_UNSUPPORTED_GROUP; @@ -10467,7 +10467,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ if (attr->value_tag != IPP_TAG_ENUM) { - send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-state value!")); + send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-state value")); if ((attr2 = copy_attribute(con->response, attr, 0)) != NULL) attr2->group_tag = IPP_TAG_UNSUPPORTED_GROUP; @@ -11303,7 +11303,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ !strcmp(attr->values[0].string.text, "none")) { send_ipp_status(con, IPP_ATTRIBUTES, - _("Unsupported compression attribute %s!"), + _("Unsupported compression attribute %s"), attr->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD, "compression", NULL, attr->values[0].string.text); @@ -11320,7 +11320,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"!"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\""), format->values[0].string.text); return; } @@ -11331,7 +11331,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ cupsdLogMessage(CUPSD_LOG_INFO, "Hint: Do you have the raw file printing rules enabled?"); send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \"%s\"!"), + _("Unsupported format \"%s\""), format->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE, "document-format", NULL, format->values[0].string.text);