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 | d3460a798a03872bf3d30391799162c1c4358e9d (patch) | |
| tree | e6555b5ef716c44ebebeab6b1f15602cdd0e1f8c | |
| parent | cd17020e66204a674dd32639930498e172b342e5 (diff) | |
| download | samba-d3460a798a03872bf3d30391799162c1c4358e9d.tar.gz samba-d3460a798a03872bf3d30391799162c1c4358e9d.tar.xz samba-d3460a798a03872bf3d30391799162c1c4358e9d.zip | |
param: rename lp function and variable from "lppausecommand" to "lppause_command"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 10 | ||||
| -rw-r--r-- | source3/printing/print_generic.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 7167aec9fa0..48b92fec020 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -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) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 5cf4edd8dec..d6fc5a791e6 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -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, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index fbd9a417db9..9f18f6c261a 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -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", diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 1560a035a12..828cb3779e7 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -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); } |