From 609e7bea49edf9ac6053d99b01c8c15be4be2329 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 4 Feb 2014 15:09:07 +1300 Subject: [PATCH] param: rename lp function and variable from "queuepausecommand" to "queuepause_command" Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 10 +++++----- source3/printing/print_generic.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 2fa8c591193..d1d55338841 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -61,7 +61,7 @@ FN_LOCAL_STRING(lpq_command, lpq_command) FN_LOCAL_STRING(lprm_command, lprm_command) FN_LOCAL_STRING(lppause_command, lppause_command) FN_LOCAL_STRING(lpresume_command, lpresume_command) -FN_LOCAL_STRING(queuepausecommand, queuepausecommand) +FN_LOCAL_STRING(queuepause_command, queuepause_command) FN_LOCAL_STRING(queueresumecommand, queueresumecommand) FN_LOCAL_STRING(_printername, _printername) FN_LOCAL_CONST_STRING(printjob_username, printjob_username) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 4d2b6577995..56b33d19ec1 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2221,7 +2221,7 @@ static struct parm_struct parm_table[] = { .label = "queuepause command", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(queuepausecommand), + .offset = LOCAL_VAR(queuepause_command), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4c188fba9f5..606889f1b9f 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 72bfa2b9783..9c20272d796 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); } /****************************************************************************