param: rename lp function and variable from "lpqcommand" to "lpq_command"

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

4 files changed, 11 insertions, 11 deletions

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 5d000959cc..1ae36bb305 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -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)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 24bbbb9f81..2cd4f56f47 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -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,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 44aebdde63..5c59b1da2c 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -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",
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 62c95f5cb3..7253eba260 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -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);