param: Rename variable used for lp_printcommand szPrintcommand

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 3d6f144dab1a91c294e6016d19d2d5d3c5988d1a..8515645aa4e4f2e78d0e96affb809aa21e2ab4a7 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -56,7 +56,7 @@ FN_LOCAL_STRING(username, username)
 FN_LOCAL_LIST(invalid_users, invalid_users)
 FN_LOCAL_LIST(valid_users, valid_users)
 FN_LOCAL_LIST(admin_users, admin_users)
-FN_LOCAL_STRING(printcommand, szPrintcommand)
+FN_LOCAL_STRING(printcommand, printcommand)
 FN_LOCAL_STRING(lpqcommand, szLpqcommand)
 FN_LOCAL_STRING(lprmcommand, szLprmcommand)
 FN_LOCAL_STRING(lppausecommand, szLppausecommand)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 539887fd2209147b725550a44cbd7c0fa21c3488..15c555a3f67d2fcc9e614f75f93e52b05831d639 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2158,7 +2158,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPrintcommand),
+               .offset         = LOCAL_VAR(printcommand),
                .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 d63577d899a424689039b66abf74a5783ff4c44e..443b6b4a20019a2266c522c670d660f2b90c2ff7 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -158,7 +158,7 @@ static struct loadparm_service sDefault =
        .rootpreexec = NULL,
        .rootpostexec = NULL,
        .szCupsOptions = NULL,
-       .szPrintcommand = NULL,
+       .printcommand = NULL,
        .szLpqcommand = NULL,
        .szLprmcommand = NULL,
        .szLppausecommand = NULL,
@@ -387,14 +387,14 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_LPROS2:
                        string_set(&pService->szLpqcommand, "lpq -P'%p'");
                        string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
-                       string_set(&pService->szPrintcommand, "lpr -r -P'%p' %s");
+                       string_set(&pService->printcommand, "lpr -r -P'%p' %s");
                        break;
 
                case PRINT_LPRNG:
                case PRINT_PLP:
                        string_set(&pService->szLpqcommand, "lpq -P'%p'");
                        string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
-                       string_set(&pService->szPrintcommand, "lpr -r -P'%p' %s");
+                       string_set(&pService->printcommand, "lpr -r -P'%p' %s");
                        string_set(&pService->szQueuepausecommand, "lpc stop '%p'");
                        string_set(&pService->szQueueresumecommand, "lpc start '%p'");
                        string_set(&pService->szLppausecommand, "lpc hold '%p' %j");
@@ -407,7 +407,7 @@ static void init_printer_values(struct loadparm_service *pService)
                           name only.  This is used by cups_queue_get() */
                        string_set(&pService->szLpqcommand, "%p");
                        string_set(&pService->szLprmcommand, "");
-                       string_set(&pService->szPrintcommand, "");
+                       string_set(&pService->printcommand, "");
                        string_set(&pService->szLppausecommand, "");
                        string_set(&pService->szLpresumecommand, "");
                        string_set(&pService->szQueuepausecommand, "");
@@ -418,7 +418,7 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_HPUX:
                        string_set(&pService->szLpqcommand, "lpstat -o%p");
                        string_set(&pService->szLprmcommand, "cancel %p-%j");
-                       string_set(&pService->szPrintcommand, "lp -c -d%p %s; rm %s");
+                       string_set(&pService->printcommand, "lp -c -d%p %s; rm %s");
                        string_set(&pService->szQueuepausecommand, "disable %p");
                        string_set(&pService->szQueueresumecommand, "enable %p");
 #ifndef HPUX
@@ -430,7 +430,7 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_QNX:
                        string_set(&pService->szLpqcommand, "lpq -P%p");
                        string_set(&pService->szLprmcommand, "lprm -P%p %j");
-                       string_set(&pService->szPrintcommand, "lp -r -P%p %s");
+                       string_set(&pService->printcommand, "lp -r -P%p %s");
                        break;
 
 #if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
@@ -451,7 +451,7 @@ static void init_printer_values(struct loadparm_service *pService)
 
                tmp = talloc_asprintf(tmp_ctx, "vlp %s print %%p %%s",
                                      tdbfile);
-               string_set(&pService->szPrintcommand,
+               string_set(&pService->printcommand,
                           tmp ? tmp : "vlp print %p %s");
 
                tmp = talloc_asprintf(tmp_ctx, "vlp %s lpq %%p",