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>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 2fa8c5911936de336defea4c074e4cd8b0bdc78b..d1d55338841e60b868632c4e3fb2ba4f0ecd8631 100644 (file)
--- 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 4d2b65779950dcb14751c106522f46e960bb4872..56b33d19ec13a4b020744e787c6dc3ddc210e5d8 100644 (file)
--- 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 4c188fba9f50c431506c59692ace95e5a877c566..606889f1b9f25f3c8a97094eb3639d85554bc2af 100644 (file)
--- 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 72bfa2b9783b17efcc71bbf52579dd0cceabc87c..9c20272d7964cc7c70c10df191d5c7c4812930b5 100644 (file)
--- 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);
 }
 
 /****************************************************************************