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

param: rename lp function and variable from "lpqcommand" to "lpq_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 3fda1fa96f
commit b8eedddc2f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -57,7 +57,7 @@ FN_LOCAL_LIST(invalid_users, invalid_users)
FN_LOCAL_LIST(valid_users, valid_users) FN_LOCAL_LIST(valid_users, valid_users)
FN_LOCAL_LIST(admin_users, admin_users) FN_LOCAL_LIST(admin_users, admin_users)
FN_LOCAL_STRING(printcommand, printcommand) FN_LOCAL_STRING(printcommand, printcommand)
FN_LOCAL_STRING(lpqcommand, lpqcommand) FN_LOCAL_STRING(lpq_command, lpq_command)
FN_LOCAL_STRING(lprmcommand, lprmcommand) FN_LOCAL_STRING(lprmcommand, lprmcommand)
FN_LOCAL_STRING(lppause_command, lppause_command) FN_LOCAL_STRING(lppause_command, lppause_command)
FN_LOCAL_STRING(lpresumecommand, lpresumecommand) FN_LOCAL_STRING(lpresumecommand, lpresumecommand)

2
lib/param/param_table.c
View File

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

14
source3/param/loadparm.c
View File

@ -159,7 +159,7 @@ static struct loadparm_service sDefault =
.root_postexec = NULL, .root_postexec = NULL,
.cups_options = NULL, .cups_options = NULL,
.printcommand = NULL, .printcommand = NULL,
.lpqcommand = NULL, .lpq_command = NULL,
.lprmcommand = NULL, .lprmcommand = NULL,
.lppause_command = NULL, .lppause_command = NULL,
.lpresumecommand = NULL, .lpresumecommand = NULL,
@ -381,14 +381,14 @@ static void init_printer_values(struct loadparm_service *pService)
case PRINT_AIX: case PRINT_AIX:
case PRINT_LPRNT: case PRINT_LPRNT:
case PRINT_LPROS2: case PRINT_LPROS2:
string_set(&pService->lpqcommand, "lpq -P'%p'"); string_set(&pService->lpq_command, "lpq -P'%p'");
string_set(&pService->lprmcommand, "lprm -P'%p' %j"); string_set(&pService->lprmcommand, "lprm -P'%p' %j");
string_set(&pService->printcommand, "lpr -r -P'%p' %s"); string_set(&pService->printcommand, "lpr -r -P'%p' %s");
break; break;
case PRINT_LPRNG: case PRINT_LPRNG:
case PRINT_PLP: case PRINT_PLP:
string_set(&pService->lpqcommand, "lpq -P'%p'"); string_set(&pService->lpq_command, "lpq -P'%p'");
string_set(&pService->lprmcommand, "lprm -P'%p' %j"); string_set(&pService->lprmcommand, "lprm -P'%p' %j");
string_set(&pService->printcommand, "lpr -r -P'%p' %s"); string_set(&pService->printcommand, "lpr -r -P'%p' %s");
string_set(&pService->queuepausecommand, "lpc stop '%p'"); string_set(&pService->queuepausecommand, "lpc stop '%p'");
@ -401,7 +401,7 @@ static void init_printer_values(struct loadparm_service *pService)
case PRINT_IPRINT: case PRINT_IPRINT:
/* set the lpq command to contain the destination printer /* set the lpq command to contain the destination printer
name only. This is used by cups_queue_get() */ name only. This is used by cups_queue_get() */
string_set(&pService->lpqcommand, "%p"); string_set(&pService->lpq_command, "%p");
string_set(&pService->lprmcommand, ""); string_set(&pService->lprmcommand, "");
string_set(&pService->printcommand, ""); string_set(&pService->printcommand, "");
string_set(&pService->lppause_command, ""); string_set(&pService->lppause_command, "");
@ -412,7 +412,7 @@ static void init_printer_values(struct loadparm_service *pService)
case PRINT_SYSV: case PRINT_SYSV:
case PRINT_HPUX: case PRINT_HPUX:
string_set(&pService->lpqcommand, "lpstat -o%p"); string_set(&pService->lpq_command, "lpstat -o%p");
string_set(&pService->lprmcommand, "cancel %p-%j"); string_set(&pService->lprmcommand, "cancel %p-%j");
string_set(&pService->printcommand, "lp -c -d%p %s; rm %s"); string_set(&pService->printcommand, "lp -c -d%p %s; rm %s");
string_set(&pService->queuepausecommand, "disable %p"); string_set(&pService->queuepausecommand, "disable %p");
@ -424,7 +424,7 @@ static void init_printer_values(struct loadparm_service *pService)
break; break;
case PRINT_QNX: case PRINT_QNX:
string_set(&pService->lpqcommand, "lpq -P%p"); string_set(&pService->lpq_command, "lpq -P%p");
string_set(&pService->lprmcommand, "lprm -P%p %j"); string_set(&pService->lprmcommand, "lprm -P%p %j");
string_set(&pService->printcommand, "lp -r -P%p %s"); string_set(&pService->printcommand, "lp -r -P%p %s");
break; break;
@ -452,7 +452,7 @@ static void init_printer_values(struct loadparm_service *pService)
tmp = talloc_asprintf(tmp_ctx, "vlp %s lpq %%p", tmp = talloc_asprintf(tmp_ctx, "vlp %s lpq %%p",
tdbfile); tdbfile);
string_set(&pService->lpqcommand, string_set(&pService->lpq_command,
tmp ? tmp : "vlp lpq %p"); tmp ? tmp : "vlp lpq %p");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j", tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j",

4
source3/printing/printing.c
View File

@ -1665,7 +1665,7 @@ static void print_queue_update(struct messaging_context *msg_ctx,
/* don't strip out characters like '$' from the printername */ /* don't strip out characters like '$' from the printername */
lpqcommand = talloc_string_sub2(ctx, lpqcommand = talloc_string_sub2(ctx,
lp_lpqcommand(talloc_tos(), snum), lp_lpq_command(talloc_tos(), snum),
"%p", "%p",
lp_printername(talloc_tos(), snum), lp_printername(talloc_tos(), snum),
false, false, false); false, false, false);
@ -2968,7 +2968,7 @@ NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
/* don't strip out characters like '$' from the printername */ /* don't strip out characters like '$' from the printername */
lpq_cmd = talloc_string_sub2(tmp_ctx, lpq_cmd = talloc_string_sub2(tmp_ctx,
lp_lpqcommand(talloc_tos(), snum), lp_lpq_command(talloc_tos(), snum),
"%p", "%p",
lp_printername(talloc_tos(), snum), lp_printername(talloc_tos(), snum),
false, false, false); false, false, false);