diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:03:23 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:44 -0800 |
| commit | cbb3381f76064bc4d8df6ce2bb021f2bf7ff0347 (patch) | |
| tree | 67816550aa6d908c421bb535f252d97c2443606a | |
| parent | 00c55b25b63a7f2b98b7089b9a5269e9f52e6bf2 (diff) | |
| download | samba-cbb3381f76064bc4d8df6ce2bb021f2bf7ff0347.tar.gz samba-cbb3381f76064bc4d8df6ce2bb021f2bf7ff0347.tar.xz samba-cbb3381f76064bc4d8df6ce2bb021f2bf7ff0347.zip | |
param: Rename variable used for lp_queueresumecommand szQueueresumecommand
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
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 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 07e8727df0..03476b99d7 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -62,7 +62,7 @@ FN_LOCAL_STRING(lprmcommand, lprmcommand) FN_LOCAL_STRING(lppausecommand, lppausecommand) FN_LOCAL_STRING(lpresumecommand, lpresumecommand) FN_LOCAL_STRING(queuepausecommand, queuepausecommand) -FN_LOCAL_STRING(queueresumecommand, szQueueresumecommand) +FN_LOCAL_STRING(queueresumecommand, queueresumecommand) static FN_LOCAL_STRING(_printername, szPrintername) FN_LOCAL_CONST_STRING(printjob_username, szPrintjobUsername) FN_LOCAL_STRING(magicscript, szMagicScript) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 461634b07e..94e7fd4fb3 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2230,7 +2230,7 @@ static struct parm_struct parm_table[] = { .label = "queueresume command", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szQueueresumecommand), + .offset = LOCAL_VAR(queueresumecommand), .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 6779f4a1fe..7240cf81b8 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -164,7 +164,7 @@ static struct loadparm_service sDefault = .lppausecommand = NULL, .lpresumecommand = NULL, .queuepausecommand = NULL, - .szQueueresumecommand = NULL, + .queueresumecommand = NULL, .szPrintername = NULL, .szPrintjobUsername = NULL, .dontdescend = NULL, @@ -396,7 +396,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lprmcommand, "lprm -P'%p' %j"); string_set(&pService->printcommand, "lpr -r -P'%p' %s"); string_set(&pService->queuepausecommand, "lpc stop '%p'"); - string_set(&pService->szQueueresumecommand, "lpc start '%p'"); + string_set(&pService->queueresumecommand, "lpc start '%p'"); string_set(&pService->lppausecommand, "lpc hold '%p' %j"); string_set(&pService->lpresumecommand, "lpc release '%p' %j"); break; @@ -411,7 +411,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lppausecommand, ""); string_set(&pService->lpresumecommand, ""); string_set(&pService->queuepausecommand, ""); - string_set(&pService->szQueueresumecommand, ""); + string_set(&pService->queueresumecommand, ""); break; case PRINT_SYSV: @@ -420,7 +420,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lprmcommand, "cancel %p-%j"); string_set(&pService->printcommand, "lp -c -d%p %s; rm %s"); string_set(&pService->queuepausecommand, "disable %p"); - string_set(&pService->szQueueresumecommand, "enable %p"); + string_set(&pService->queueresumecommand, "enable %p"); #ifndef HPUX string_set(&pService->lppausecommand, "lp -i %p-%j -H hold"); string_set(&pService->lpresumecommand, "lp -i %p-%j -H resume"); @@ -481,7 +481,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s queueresume %%p", tdbfile); - string_set(&pService->szQueueresumecommand, + string_set(&pService->queueresumecommand, tmp ? tmp : "vlp queueresume %p"); TALLOC_FREE(tmp_ctx); |