param: rename lp function and variable from "lprmcommand" to "lprm_command"
authorGarming Sam <garming@catalyst.net.nz>
Tue, 4 Feb 2014 02:09:07 +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 2661c469a047ea6f33cf17e2d4b3b36312502090..a68dcff2fc1dfeb1da481da67813107bef1ef077 100644 (file)
@@ -58,7 +58,7 @@ FN_LOCAL_LIST(valid_users, valid_users)
 FN_LOCAL_LIST(admin_users, admin_users)
 FN_LOCAL_STRING(printcommand, printcommand)
 FN_LOCAL_STRING(lpq_command, lpq_command)
-FN_LOCAL_STRING(lprmcommand, lprmcommand)
+FN_LOCAL_STRING(lprm_command, lprm_command)
 FN_LOCAL_STRING(lppause_command, lppause_command)
 FN_LOCAL_STRING(lpresume_command, lpresume_command)
 FN_LOCAL_STRING(queuepausecommand, queuepausecommand)
index 235fdd14f571891202a2a4c4144abf7e1d7044b6..9c3b015fd7b8988d18e82bf5aedf37bf74ba0179 100644 (file)
@@ -2194,7 +2194,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lprm command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(lprmcommand),
+               .offset         = LOCAL_VAR(lprm_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
index 31d1c6a9a74807e2af5febf1d1b5cd6138abffca..2c66770d806666aac7c5aa98f93a0a7c5bea64d0 100644 (file)
@@ -160,7 +160,7 @@ static struct loadparm_service sDefault =
        .cups_options = NULL,
        .printcommand = NULL,
        .lpq_command = NULL,
-       .lprmcommand = NULL,
+       .lprm_command = NULL,
        .lppause_command = NULL,
        .lpresume_command = NULL,
        .queuepausecommand = NULL,
@@ -382,14 +382,14 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_LPRNT:
                case PRINT_LPROS2:
                        string_set(&pService->lpq_command, "lpq -P'%p'");
-                       string_set(&pService->lprmcommand, "lprm -P'%p' %j");
+                       string_set(&pService->lprm_command, "lprm -P'%p' %j");
                        string_set(&pService->printcommand, "lpr -r -P'%p' %s");
                        break;
 
                case PRINT_LPRNG:
                case PRINT_PLP:
                        string_set(&pService->lpq_command, "lpq -P'%p'");
-                       string_set(&pService->lprmcommand, "lprm -P'%p' %j");
+                       string_set(&pService->lprm_command, "lprm -P'%p' %j");
                        string_set(&pService->printcommand, "lpr -r -P'%p' %s");
                        string_set(&pService->queuepausecommand, "lpc stop '%p'");
                        string_set(&pService->queueresumecommand, "lpc start '%p'");
@@ -402,7 +402,7 @@ static void init_printer_values(struct loadparm_service *pService)
                        /* set the lpq command to contain the destination printer
                           name only.  This is used by cups_queue_get() */
                        string_set(&pService->lpq_command, "%p");
-                       string_set(&pService->lprmcommand, "");
+                       string_set(&pService->lprm_command, "");
                        string_set(&pService->printcommand, "");
                        string_set(&pService->lppause_command, "");
                        string_set(&pService->lpresume_command, "");
@@ -413,7 +413,7 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_SYSV:
                case PRINT_HPUX:
                        string_set(&pService->lpq_command, "lpstat -o%p");
-                       string_set(&pService->lprmcommand, "cancel %p-%j");
+                       string_set(&pService->lprm_command, "cancel %p-%j");
                        string_set(&pService->printcommand, "lp -c -d%p %s; rm %s");
                        string_set(&pService->queuepausecommand, "disable %p");
                        string_set(&pService->queueresumecommand, "enable %p");
@@ -425,7 +425,7 @@ static void init_printer_values(struct loadparm_service *pService)
 
                case PRINT_QNX:
                        string_set(&pService->lpq_command, "lpq -P%p");
-                       string_set(&pService->lprmcommand, "lprm -P%p %j");
+                       string_set(&pService->lprm_command, "lprm -P%p %j");
                        string_set(&pService->printcommand, "lp -r -P%p %s");
                        break;
 
@@ -457,7 +457,7 @@ static void init_printer_values(struct loadparm_service *pService)
 
                tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j",
                                      tdbfile);
-               string_set(&pService->lprmcommand,
+               string_set(&pService->lprm_command,
                           tmp ? tmp : "vlp lprm %p %j");
 
                tmp = talloc_asprintf(tmp_ctx, "vlp %s lppause %%p %%j",
index 7253eba26084cd3699a7bb610be34f738d9a57fe..48eb450d7972c55fa6b4fd49d68c6ee4fa4fe9b9 100644 (file)
@@ -1685,7 +1685,7 @@ static void print_queue_update(struct messaging_context *msg_ctx,
        }
 
        lprmcommand = talloc_string_sub2(ctx,
-                       lp_lprmcommand(talloc_tos(), snum),
+                       lp_lprm_command(talloc_tos(), snum),
                        "%p",
                        lp_printername(talloc_tos(), snum),
                        false, false, false);
@@ -2147,7 +2147,7 @@ static bool print_job_delete1(struct tevent_context *ev,
        {
                result = (*(current_printif->job_delete))(
                        lp_printername(talloc_tos(), snum),
-                       lp_lprmcommand(talloc_tos(), snum),
+                       lp_lprm_command(talloc_tos(), snum),
                        pjob);
 
                /* Delete the tdb entry if the delete succeeded or the job hasn't