diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:06 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:14 -0800 |
| commit | b8eedddc2faa19dce649dd220c42f5aa65fbbc92 (patch) | |
| tree | c135d90c456fec633b44e0fef89adc723ef3c12d /source3 | |
| parent | 3fda1fa96f6d8a36bad2d18b4c4e7fc4a679466f (diff) | |
| download | samba-b8eedddc2faa19dce649dd220c42f5aa65fbbc92.tar.gz samba-b8eedddc2faa19dce649dd220c42f5aa65fbbc92.tar.xz samba-b8eedddc2faa19dce649dd220c42f5aa65fbbc92.zip | |
param: rename lp function and variable from "lpqcommand" to "lpq_command"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 14 | ||||
| -rw-r--r-- | source3/printing/printing.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 44aebdde63..5c59b1da2c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -159,7 +159,7 @@ static struct loadparm_service sDefault = .root_postexec = NULL, .cups_options = NULL, .printcommand = NULL, - .lpqcommand = NULL, + .lpq_command = NULL, .lprmcommand = NULL, .lppause_command = NULL, .lpresumecommand = NULL, @@ -381,14 +381,14 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_AIX: case PRINT_LPRNT: 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->printcommand, "lpr -r -P'%p' %s"); break; case PRINT_LPRNG: 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->printcommand, "lpr -r -P'%p' %s"); string_set(&pService->queuepausecommand, "lpc stop '%p'"); @@ -401,7 +401,7 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_IPRINT: /* set the lpq command to contain the destination printer 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->printcommand, ""); string_set(&pService->lppause_command, ""); @@ -412,7 +412,7 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_SYSV: 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->printcommand, "lp -c -d%p %s; rm %s"); string_set(&pService->queuepausecommand, "disable %p"); @@ -424,7 +424,7 @@ static void init_printer_values(struct loadparm_service *pService) break; 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->printcommand, "lp -r -P%p %s"); break; @@ -452,7 +452,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s lpq %%p", tdbfile); - string_set(&pService->lpqcommand, + string_set(&pService->lpq_command, tmp ? tmp : "vlp lpq %p"); tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j", diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 62c95f5cb3..7253eba260 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1665,7 +1665,7 @@ static void print_queue_update(struct messaging_context *msg_ctx, /* don't strip out characters like '$' from the printername */ lpqcommand = talloc_string_sub2(ctx, - lp_lpqcommand(talloc_tos(), snum), + lp_lpq_command(talloc_tos(), snum), "%p", lp_printername(talloc_tos(), snum), 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 */ lpq_cmd = talloc_string_sub2(tmp_ctx, - lp_lpqcommand(talloc_tos(), snum), + lp_lpq_command(talloc_tos(), snum), "%p", lp_printername(talloc_tos(), snum), false, false, false); |