sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

param: rename lp function and variable from "queueresumecommand" to "queueresume_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:08 +13:00 committed by Jeremy Allison
parent 609e7bea49
commit 798678ecfc
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

@ -62,7 +62,7 @@ FN_LOCAL_STRING(lprm_command, lprm_command)
FN_LOCAL_STRING(lppause_command, lppause_command)
FN_LOCAL_STRING(lpresume_command, lpresume_command)
FN_LOCAL_STRING(queuepause_command, queuepause_command)
FN_LOCAL_STRING(queueresumecommand, queueresumecommand)
FN_LOCAL_STRING(queueresume_command, queueresume_command)
FN_LOCAL_STRING(_printername, _printername)
FN_LOCAL_CONST_STRING(printjob_username, printjob_username)
FN_LOCAL_STRING(magic_script, magic_script)

2
lib/param/param_table.c
View File

@ -2230,7 +2230,7 @@ static struct parm_struct parm_table[] = {
.label = "queueresume command",
.type = P_STRING,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(queueresumecommand),
.offset = LOCAL_VAR(queueresume_command),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,

10
source3/param/loadparm.c
View File

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

2
source3/printing/print_generic.c
View File

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