param: rename lp function and variable from "lpqcommand" to "lpq_command"
authorGarming Sam <garming@catalyst.net.nz>
Tue, 4 Feb 2014 02:09:06 +0000 (15:09 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 8 Feb 2014 00:19:14 +0000 (16:19 -0800)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/param_functions.c
lib/param/param_table.c
source3/param/loadparm.c
source3/printing/printing.c

index 5d000959cc87a0f9f0f5296767d796d7bc84d09d..1ae36bb305cab383a5e7cbfb686d081a0540c9a0 100644 (file)
@@ -57,7 +57,7 @@ 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, printcommand)
-FN_LOCAL_STRING(lpqcommand, lpqcommand)
+FN_LOCAL_STRING(lpq_command, lpq_command)
 FN_LOCAL_STRING(lprmcommand, lprmcommand)
 FN_LOCAL_STRING(lppause_command, lppause_command)
 FN_LOCAL_STRING(lpresumecommand, lpresumecommand)
index 24bbbb9f810546465138baa77e4e4bae58fb631d..2cd4f56f47297926acd1c5071fa20374967aba44 100644 (file)
@@ -2185,7 +2185,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpq command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(lpqcommand),
+               .offset         = LOCAL_VAR(lpq_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
index 44aebdde631fb1f54348be8a12fcbcd684294f53..5c59b1da2cabc4a61be98e71414d527a95f9fbb5 100644 (file)
@@ -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",
index 62c95f5cb35b9418e19af694ddf3a61e20978b74..7253eba26084cd3699a7bb610be34f738d9a57fe 100644 (file)
@@ -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);