125 lines
4.7 KiB
Diff
125 lines
4.7 KiB
Diff
--- cngpij/cngpij/bjcups.c.orig 2013-07-17 11:33:45.000000000 +1000
|
|
+++ cngpij/cngpij/bjcups.c 2022-03-06 11:35:54.874000000 +1000
|
|
@@ -698,8 +698,8 @@
|
|
else {
|
|
pRequest = ippNew();
|
|
|
|
- pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
|
|
- pRequest->request.op.request_id = 1;
|
|
+ ippSetOperation(pRequest, CUPS_GET_PRINTERS);
|
|
+ ippSetRequestId(pRequest, 1);
|
|
|
|
pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
|
|
|
|
@@ -708,29 +708,29 @@
|
|
ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
|
|
|
|
if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
|
|
- if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
|
|
+ if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
|
|
fputs("ERROR: IPP ERROR\n", stderr);
|
|
goto onErr;
|
|
}
|
|
else {
|
|
- pAttribute = pResponse->attrs;
|
|
+ pAttribute = ippFirstAttribute(pResponse);
|
|
|
|
while (pAttribute != NULL) {
|
|
- while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
|
|
- pAttribute = pAttribute->next;
|
|
+ while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
|
|
+ pAttribute = ippNextAttribute(pResponse);
|
|
}
|
|
if (pAttribute == NULL) {
|
|
break;
|
|
}
|
|
|
|
- while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
|
|
- if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
|
|
- pPrinter = pAttribute->values[0].string.text;
|
|
+ while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
|
|
+ if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
|
|
+ pPrinter = ippGetString(pAttribute, 0, NULL);
|
|
}
|
|
- if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
|
|
- pDUri = pAttribute->values[0].string.text;
|
|
+ if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
|
|
+ pDUri = ippGetString(pAttribute, 0, NULL);
|
|
}
|
|
- pAttribute = pAttribute->next;
|
|
+ pAttribute = ippNextAttribute(pResponse);
|
|
}
|
|
|
|
if (strcasecmp(pDestName, pPrinter) == 0) {
|
|
@@ -739,7 +739,7 @@
|
|
}
|
|
|
|
if (pAttribute != NULL)
|
|
- pAttribute = pAttribute->next;
|
|
+ pAttribute = ippNextAttribute(pResponse);
|
|
}
|
|
}
|
|
|
|
--- cngpijmnt/src/main.c.orig 2022-03-06 11:44:22.748000000 +1000
|
|
+++ cngpijmnt/src/main.c 2022-03-06 12:01:18.331000000 +1000
|
|
@@ -322,8 +322,8 @@
|
|
else {
|
|
pRequest = ippNew();
|
|
|
|
- pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
|
|
- pRequest->request.op.request_id = 1;
|
|
+ ippSetOperation(pRequest, CUPS_GET_PRINTERS);
|
|
+ ippSetRequestId(pRequest, 1);
|
|
|
|
pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
|
|
|
|
@@ -332,29 +332,29 @@
|
|
ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
|
|
|
|
if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
|
|
- if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
|
|
+ if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
|
|
fputs("ERROR: IPP ERROR\n", stderr);
|
|
goto onErr;
|
|
}
|
|
else {
|
|
- pAttribute = pResponse->attrs;
|
|
+ pAttribute = ippFirstAttribute(pResponse);
|
|
|
|
while (pAttribute != NULL) {
|
|
- while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
|
|
- pAttribute = pAttribute->next;
|
|
+ while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
|
|
+ pAttribute = ippNextAttribute(pResponse);
|
|
}
|
|
if (pAttribute == NULL) {
|
|
break;
|
|
}
|
|
|
|
- while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
|
|
- if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
|
|
- pPrinter = pAttribute->values[0].string.text;
|
|
+ while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
|
|
+ if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
|
|
+ pPrinter = ippGetString(pAttribute, 0, NULL);
|
|
}
|
|
- if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
|
|
- pDUri = pAttribute->values[0].string.text;
|
|
+ if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
|
|
+ pDUri = ippGetString(pAttribute, 0, NULL);
|
|
}
|
|
- pAttribute = pAttribute->next;
|
|
+ pAttribute = ippNextAttribute(pResponse);
|
|
}
|
|
|
|
if (strcasecmp(pDestName, pPrinter) == 0) {
|
|
@@ -363,7 +363,7 @@
|
|
}
|
|
|
|
if (pAttribute != NULL)
|
|
- pAttribute = pAttribute->next;
|
|
+ pAttribute = ippNextAttribute(pResponse);
|
|
}
|
|
}
|
|
|