diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:07 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:14 -0800 |
| commit | 609e7bea49edf9ac6053d99b01c8c15be4be2329 (patch) | |
| tree | 396cfb6cffe5889308c224aced9c12b423ac4630 /source3 | |
| parent | 77d04917f79fa64733a3af17efce40926107d4e6 (diff) | |
| download | samba-609e7bea49edf9ac6053d99b01c8c15be4be2329.tar.gz samba-609e7bea49edf9ac6053d99b01c8c15be4be2329.tar.xz samba-609e7bea49edf9ac6053d99b01c8c15be4be2329.zip | |
param: rename lp function and variable from "queuepausecommand" to "queuepause_command"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 10 | ||||
| -rw-r--r-- | source3/printing/print_generic.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4c188fba9f..606889f1b9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -163,7 +163,7 @@ static struct loadparm_service sDefault = .lprm_command = NULL, .lppause_command = NULL, .lpresume_command = NULL, - .queuepausecommand = NULL, + .queuepause_command = NULL, .queueresumecommand = NULL, ._printername = NULL, .printjob_username = NULL, @@ -391,7 +391,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lpq_command, "lpq -P'%p'"); string_set(&pService->lprm_command, "lprm -P'%p' %j"); string_set(&pService->print_command, "lpr -r -P'%p' %s"); - string_set(&pService->queuepausecommand, "lpc stop '%p'"); + string_set(&pService->queuepause_command, "lpc stop '%p'"); string_set(&pService->queueresumecommand, "lpc start '%p'"); string_set(&pService->lppause_command, "lpc hold '%p' %j"); string_set(&pService->lpresume_command, "lpc release '%p' %j"); @@ -406,7 +406,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->print_command, ""); string_set(&pService->lppause_command, ""); string_set(&pService->lpresume_command, ""); - string_set(&pService->queuepausecommand, ""); + string_set(&pService->queuepause_command, ""); string_set(&pService->queueresumecommand, ""); break; @@ -415,7 +415,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lpq_command, "lpstat -o%p"); string_set(&pService->lprm_command, "cancel %p-%j"); string_set(&pService->print_command, "lp -c -d%p %s; rm %s"); - string_set(&pService->queuepausecommand, "disable %p"); + string_set(&pService->queuepause_command, "disable %p"); string_set(&pService->queueresumecommand, "enable %p"); #ifndef HPUX string_set(&pService->lppause_command, "lp -i %p-%j -H hold"); @@ -472,7 +472,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s queuepause %%p", tdbfile); - string_set(&pService->queuepausecommand, + string_set(&pService->queuepause_command, tmp ? tmp : "vlp queuepause %p"); tmp = talloc_asprintf(tmp_ctx, "vlp %s queueresume %%p", diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 72bfa2b978..9c20272d79 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -308,7 +308,7 @@ static int generic_job_submit(int snum, struct printjob *pjob, static int generic_queue_pause(int snum) { return print_run_command(snum, lp_printername(talloc_tos(), snum), True, - lp_queuepausecommand(talloc_tos(), snum), NULL, NULL); + lp_queuepause_command(talloc_tos(), snum), NULL, NULL); } /**************************************************************************** |