diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:08 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:14 -0800 |
| commit | 798678ecfc8929174c30a97588027b678bbc85f1 (patch) | |
| tree | 4c6632173420650cbbaebf01b02c803e939de2f8 /source3 | |
| parent | 609e7bea49edf9ac6053d99b01c8c15be4be2329 (diff) | |
| download | samba-798678ecfc8929174c30a97588027b678bbc85f1.tar.gz samba-798678ecfc8929174c30a97588027b678bbc85f1.tar.xz samba-798678ecfc8929174c30a97588027b678bbc85f1.zip | |
param: rename lp function and variable from "queueresumecommand" to "queueresume_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 606889f1b9..4192d10774 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -164,7 +164,7 @@ static struct loadparm_service sDefault = .lppause_command = NULL, .lpresume_command = NULL, .queuepause_command = NULL, - .queueresumecommand = NULL, + .queueresume_command = NULL, ._printername = NULL, .printjob_username = NULL, .dont_descend = NULL, @@ -392,7 +392,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lprm_command, "lprm -P'%p' %j"); string_set(&pService->print_command, "lpr -r -P'%p' %s"); string_set(&pService->queuepause_command, "lpc stop '%p'"); - string_set(&pService->queueresumecommand, "lpc start '%p'"); + string_set(&pService->queueresume_command, "lpc start '%p'"); string_set(&pService->lppause_command, "lpc hold '%p' %j"); string_set(&pService->lpresume_command, "lpc release '%p' %j"); break; @@ -407,7 +407,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lppause_command, ""); string_set(&pService->lpresume_command, ""); string_set(&pService->queuepause_command, ""); - string_set(&pService->queueresumecommand, ""); + string_set(&pService->queueresume_command, ""); break; case PRINT_SYSV: @@ -416,7 +416,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lprm_command, "cancel %p-%j"); string_set(&pService->print_command, "lp -c -d%p %s; rm %s"); string_set(&pService->queuepause_command, "disable %p"); - string_set(&pService->queueresumecommand, "enable %p"); + string_set(&pService->queueresume_command, "enable %p"); #ifndef HPUX string_set(&pService->lppause_command, "lp -i %p-%j -H hold"); string_set(&pService->lpresume_command, "lp -i %p-%j -H resume"); @@ -477,7 +477,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s queueresume %%p", tdbfile); - string_set(&pService->queueresumecommand, + string_set(&pService->queueresume_command, tmp ? tmp : "vlp queueresume %p"); TALLOC_FREE(tmp_ctx); diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 9c20272d79..e89eed7bcd 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -317,7 +317,7 @@ static int generic_queue_pause(int snum) static int generic_queue_resume(int snum) { return print_run_command(snum, lp_printername(talloc_tos(), snum), True, - lp_queueresumecommand(talloc_tos(), snum), NULL, NULL); + lp_queueresume_command(talloc_tos(), snum), NULL, NULL); } /**************************************************************************** |