sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

param: rename lp function and variable from "queuepausecommand" to "queuepause_command"

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-04 15:09:07 +13:00 committed by Jeremy Allison
parent 77d04917f7
commit 609e7bea49
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -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)

2
lib/param/param_table.c
View File

@ -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,

10
source3/param/loadparm.c
View File

@ -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",

2
source3/printing/print_generic.c
View File

@ -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);
}
/****************************************************************************