diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:06 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:14 -0800 |
| commit | bbcd0042188757cd17fa69a459b582f42e2b3b4c (patch) | |
| tree | e6b4958c8a08e8fe08669d8ee15c75691ad37f68 /source3 | |
| parent | b8eedddc2faa19dce649dd220c42f5aa65fbbc92 (diff) | |
| download | samba-bbcd0042188757cd17fa69a459b582f42e2b3b4c.tar.gz samba-bbcd0042188757cd17fa69a459b582f42e2b3b4c.tar.xz samba-bbcd0042188757cd17fa69a459b582f42e2b3b4c.zip | |
param: rename lp function and variable from "lpresumecommand" to "lpresume_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 5c59b1da2c..31d1c6a9a7 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -162,7 +162,7 @@ static struct loadparm_service sDefault = .lpq_command = NULL, .lprmcommand = NULL, .lppause_command = NULL, - .lpresumecommand = NULL, + .lpresume_command = NULL, .queuepausecommand = NULL, .queueresumecommand = NULL, ._printername = NULL, @@ -394,7 +394,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->queuepausecommand, "lpc stop '%p'"); string_set(&pService->queueresumecommand, "lpc start '%p'"); string_set(&pService->lppause_command, "lpc hold '%p' %j"); - string_set(&pService->lpresumecommand, "lpc release '%p' %j"); + string_set(&pService->lpresume_command, "lpc release '%p' %j"); break; case PRINT_CUPS: @@ -405,7 +405,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lprmcommand, ""); string_set(&pService->printcommand, ""); string_set(&pService->lppause_command, ""); - string_set(&pService->lpresumecommand, ""); + string_set(&pService->lpresume_command, ""); string_set(&pService->queuepausecommand, ""); string_set(&pService->queueresumecommand, ""); break; @@ -419,7 +419,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->queueresumecommand, "enable %p"); #ifndef HPUX string_set(&pService->lppause_command, "lp -i %p-%j -H hold"); - string_set(&pService->lpresumecommand, "lp -i %p-%j -H resume"); + string_set(&pService->lpresume_command, "lp -i %p-%j -H resume"); #endif /* HPUX */ break; @@ -467,7 +467,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s lpresume %%p %%j", tdbfile); - string_set(&pService->lpresumecommand, + string_set(&pService->lpresume_command, tmp ? tmp : "vlp lpresume %p %j"); tmp = talloc_asprintf(tmp_ctx, "vlp %s queuepause %%p", diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 828cb3779e..681bc55180 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -133,7 +133,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, lp_printername(talloc_tos(), snum), True, - lp_lpresumecommand(talloc_tos(), snum), NULL, + lp_lpresume_command(talloc_tos(), snum), NULL, "%j", jobstr, NULL); } |