summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-01-21 18:14:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:07 -0500
commitfd2ad84d7bf92c7f12a73a281b533e8d96774870 (patch)
tree0381aced5034a42ef381e50bbdf9c8e95da6f1af
parentdbf364c9053406d4fc39c560f547545ad1988065 (diff)
downloadsamba-fd2ad84d7bf92c7f12a73a281b533e8d96774870.tar.gz
samba-fd2ad84d7bf92c7f12a73a281b533e8d96774870.tar.bz2
samba-fd2ad84d7bf92c7f12a73a281b533e8d96774870.zip
r4902: please note that cupsDoRequest() deletes the request* so don't call ippDelete(request) *ever*
(This used to be commit f65598b3b0dc99900d547eb67473cca5d371614f)
-rw-r--r--source3/printing/print_cups.c34
1 files changed, 2 insertions, 32 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index be47f16408..90af10c373 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -177,6 +177,8 @@ BOOL cups_cache_reload(void)
* requested-attributes
*/
+ request = ippNew();
+
request->request.op.operation_id = CUPS_GET_CLASSES;
request->request.op.request_id = 1;
@@ -246,10 +248,6 @@ BOOL cups_cache_reload(void)
ret = True;
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -342,10 +340,6 @@ static int cups_job_delete(int snum, struct printjob *pjob)
}
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -438,10 +432,6 @@ static int cups_job_pause(int snum, struct printjob *pjob)
}
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -534,10 +524,6 @@ static int cups_job_resume(int snum, struct printjob *pjob)
}
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -668,10 +654,6 @@ static int cups_job_submit(int snum, struct printjob *pjob)
/* else print_job_end will do it for us */
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -988,10 +970,6 @@ static int cups_queue_get(const char *printer_name,
*q = queue;
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -1086,10 +1064,6 @@ static int cups_queue_pause(int snum)
}
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);
@@ -1184,10 +1158,6 @@ static int cups_queue_resume(int snum)
}
out:
-
- if (request)
- ippDelete(request);
-
if (response)
ippDelete(response);