diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-13 12:11:26 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-13 12:40:27 +0200 |
| commit | 3f7e2222f47d5960cece48dd751470bcc0983d93 (patch) | |
| tree | ca449c0608ae34500e1613697d0788258351d5ce /source3/printing/print_generic.c | |
| parent | 1b13755698464581fb1b4a3083f5930d7b408ea4 (diff) | |
| download | samba-3f7e2222f47d5960cece48dd751470bcc0983d93.tar.gz | |
s3: Remove the pointless PRINTERNAME macro
Diffstat (limited to 'source3/printing/print_generic.c')
| -rw-r--r-- | source3/printing/print_generic.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index b789354999d..b925bedaceb 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -117,7 +117,7 @@ static int generic_job_pause(int snum, struct printjob *pjob) /* need to pause the spooled entry */ slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob); - return print_run_command(snum, PRINTERNAME(snum), True, + return print_run_command(snum, lp_printername(snum), True, lp_lppausecommand(snum), NULL, "%j", jobstr, NULL); @@ -132,7 +132,7 @@ static int generic_job_resume(int snum, struct printjob *pjob) /* need to pause the spooled entry */ slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob); - return print_run_command(snum, PRINTERNAME(snum), True, + return print_run_command(snum, lp_printername(snum), True, lp_lpresumecommand(snum), NULL, "%j", jobstr, NULL); @@ -194,7 +194,7 @@ static int generic_job_submit(int snum, struct printjob *pjob) slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size); /* send it to the system spooler */ - ret = print_run_command(snum, PRINTERNAME(snum), True, + ret = print_run_command(snum, lp_printername(snum), True, lp_printcommand(snum), NULL, "%s", p, "%J", jobname, @@ -274,7 +274,8 @@ static int generic_queue_get(const char *printer_name, ****************************************************************************/ static int generic_queue_pause(int snum) { - return print_run_command(snum, PRINTERNAME(snum), True, lp_queuepausecommand(snum), NULL, NULL); + return print_run_command(snum, lp_printername(snum), True, + lp_queuepausecommand(snum), NULL, NULL); } /**************************************************************************** @@ -282,7 +283,8 @@ static int generic_queue_pause(int snum) ****************************************************************************/ static int generic_queue_resume(int snum) { - return print_run_command(snum, PRINTERNAME(snum), True, lp_queueresumecommand(snum), NULL, NULL); + return print_run_command(snum, lp_printername(snum), True, + lp_queueresumecommand(snum), NULL, NULL); } /**************************************************************************** |