summaryrefslogtreecommitdiff
path: root/net-print/cnijfilter/files/cnijfilter-3.80-6-cups-1.6.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-print/cnijfilter/files/cnijfilter-3.80-6-cups-1.6.patch')
-rw-r--r--net-print/cnijfilter/files/cnijfilter-3.80-6-cups-1.6.patch87
1 files changed, 0 insertions, 87 deletions
diff --git a/net-print/cnijfilter/files/cnijfilter-3.80-6-cups-1.6.patch b/net-print/cnijfilter/files/cnijfilter-3.80-6-cups-1.6.patch
deleted file mode 100644
index 6b51d483..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.80-6-cups-1.6.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/cngpijmnt/src/getipc.c b/cngpijmnt/src/getipc.c
-index 8688032..54c7933 100755
---- a/cngpijmnt/src/getipc.c
-+++ b/cngpijmnt/src/getipc.c
-@@ -42,7 +42,7 @@ int GetIPCData(LPIPCU pipc, char *sname)
- int server_fd;
- int client_fd;
- char buf[128];
-- size_t len;
-+ socklen_t len;
- short ret = RET_ERROR;
-
- if( (server_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0 )
-
---- a/cngpijmnt/src/main.c 2016-11-12 23:39:03.534855723 +0100
-+++ b/cngpijmnt/src/main.c 2016-11-12 23:47:02.521847145 +0100
-@@ -308,8 +308,8 @@
- *pResponse; // Pointer to CUPS IPP response.
- ipp_attribute_t *pAttribute; // Pointer to CUPS attributes.
- cups_lang_t *pLanguage; // Pointer to language.
-- char *pPrinter = NULL; // Pointer to printer name.
-- char *pDUri = NULL; // Pointer to Device uri.
-+ const char *pPrinter = NULL; // Pointer to printer name.
-+ const char *pDUri = NULL; // Pointer to Device uri.
- short retVal = -1; // Return value.
- /*** Parameters end ***/
-
-@@ -321,8 +321,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
-
-@@ -331,29 +331,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) {
-@@ -362,7 +362,7 @@
- }
-
- if (pAttribute != NULL)
-- pAttribute = pAttribute->next;
-+ pAttribute = ippNextAttribute(pResponse);
- }
- }
-