From 7198e8bb8cb07361006c373e46784fc95b9d7667 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:03:23 +1300 Subject: [PATCH] param: Rename variable used for lp_lpresumecommand szLpresumecommand Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- 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 631f748af15..6dd5f22e3cf 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -60,7 +60,7 @@ FN_LOCAL_STRING(printcommand, printcommand) FN_LOCAL_STRING(lpqcommand, lpqcommand) FN_LOCAL_STRING(lprmcommand, lprmcommand) FN_LOCAL_STRING(lppausecommand, lppausecommand) -FN_LOCAL_STRING(lpresumecommand, szLpresumecommand) +FN_LOCAL_STRING(lpresumecommand, lpresumecommand) FN_LOCAL_STRING(queuepausecommand, szQueuepausecommand) FN_LOCAL_STRING(queueresumecommand, szQueueresumecommand) static FN_LOCAL_STRING(_printername, szPrintername) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 0d9a207e6ed..96a2f5a0e34 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2212,7 +2212,7 @@ static struct parm_struct parm_table[] = { .label = "lpresume command", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szLpresumecommand), + .offset = LOCAL_VAR(lpresumecommand), .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 e1e864e05ab..8f360a1d438 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -162,7 +162,7 @@ static struct loadparm_service sDefault = .lpqcommand = NULL, .lprmcommand = NULL, .lppausecommand = NULL, - .szLpresumecommand = NULL, + .lpresumecommand = NULL, .szQueuepausecommand = NULL, .szQueueresumecommand = NULL, .szPrintername = NULL, @@ -398,7 +398,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->szQueuepausecommand, "lpc stop '%p'"); string_set(&pService->szQueueresumecommand, "lpc start '%p'"); string_set(&pService->lppausecommand, "lpc hold '%p' %j"); - string_set(&pService->szLpresumecommand, "lpc release '%p' %j"); + string_set(&pService->lpresumecommand, "lpc release '%p' %j"); break; case PRINT_CUPS: @@ -409,7 +409,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->lprmcommand, ""); string_set(&pService->printcommand, ""); string_set(&pService->lppausecommand, ""); - string_set(&pService->szLpresumecommand, ""); + string_set(&pService->lpresumecommand, ""); string_set(&pService->szQueuepausecommand, ""); string_set(&pService->szQueueresumecommand, ""); break; @@ -423,7 +423,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->szQueueresumecommand, "enable %p"); #ifndef HPUX string_set(&pService->lppausecommand, "lp -i %p-%j -H hold"); - string_set(&pService->szLpresumecommand, "lp -i %p-%j -H resume"); + string_set(&pService->lpresumecommand, "lp -i %p-%j -H resume"); #endif /* HPUX */ break; @@ -471,7 +471,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s lpresume %%p %%j", tdbfile); - string_set(&pService->szLpresumecommand, + string_set(&pService->lpresumecommand, tmp ? tmp : "vlp lpresume %p %j"); tmp = talloc_asprintf(tmp_ctx, "vlp %s queuepause %%p",