sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

param: rename lp function and variable from "lppausecommand" to "lppause_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:06 +13:00 committed by Jeremy Allison
parent cd17020e66
commit d3460a798a
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

@ -59,7 +59,7 @@ FN_LOCAL_LIST(admin_users, admin_users)
FN_LOCAL_STRING(printcommand, printcommand)
FN_LOCAL_STRING(lpqcommand, lpqcommand)
FN_LOCAL_STRING(lprmcommand, lprmcommand)
FN_LOCAL_STRING(lppausecommand, lppausecommand)
FN_LOCAL_STRING(lppause_command, lppause_command)
FN_LOCAL_STRING(lpresumecommand, lpresumecommand)
FN_LOCAL_STRING(queuepausecommand, queuepausecommand)
FN_LOCAL_STRING(queueresumecommand, queueresumecommand)

2
lib/param/param_table.c
View File

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

10
source3/param/loadparm.c
View File

@ -161,7 +161,7 @@ static struct loadparm_service sDefault =
.printcommand = NULL,
.lpqcommand = NULL,
.lprmcommand = NULL,
.lppausecommand = NULL,
.lppause_command = NULL,
.lpresumecommand = NULL,
.queuepausecommand = NULL,
.queueresumecommand = NULL,
@ -393,7 +393,7 @@ static void init_printer_values(struct loadparm_service *pService)
string_set(&pService->printcommand, "lpr -r -P'%p' %s");
string_set(&pService->queuepausecommand, "lpc stop '%p'");
string_set(&pService->queueresumecommand, "lpc start '%p'");
string_set(&pService->lppausecommand, "lpc hold '%p' %j");
string_set(&pService->lppause_command, "lpc hold '%p' %j");
string_set(&pService->lpresumecommand, "lpc release '%p' %j");
break;
@ -404,7 +404,7 @@ static void init_printer_values(struct loadparm_service *pService)
string_set(&pService->lpqcommand, "%p");
string_set(&pService->lprmcommand, "");
string_set(&pService->printcommand, "");
string_set(&pService->lppausecommand, "");
string_set(&pService->lppause_command, "");
string_set(&pService->lpresumecommand, "");
string_set(&pService->queuepausecommand, "");
string_set(&pService->queueresumecommand, "");
@ -418,7 +418,7 @@ static void init_printer_values(struct loadparm_service *pService)
string_set(&pService->queuepausecommand, "disable %p");
string_set(&pService->queueresumecommand, "enable %p");
#ifndef HPUX
string_set(&pService->lppausecommand, "lp -i %p-%j -H hold");
string_set(&pService->lppause_command, "lp -i %p-%j -H hold");
string_set(&pService->lpresumecommand, "lp -i %p-%j -H resume");
#endif /* HPUX */
break;
@ -462,7 +462,7 @@ static void init_printer_values(struct loadparm_service *pService)
tmp = talloc_asprintf(tmp_ctx, "vlp %s lppause %%p %%j",
tdbfile);
string_set(&pService->lppausecommand,
string_set(&pService->lppause_command,
tmp ? tmp : "vlp lppause %p %j");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lpresume %%p %%j",

2
source3/printing/print_generic.c
View File

@ -118,7 +118,7 @@ static int generic_job_pause(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_lppausecommand(talloc_tos(), snum), NULL,
lp_lppause_command(talloc_tos(), snum), NULL,
"%j", jobstr,
NULL);
}