svn commit: samba r2090 - in branches/SAMBA_3_0/source/param: .

jerry at samba.org jerry at samba.org
Fri Aug 27 16:13:51 GMT 2004


Author: jerry
Date: 2004-08-27 16:13:50 +0000 (Fri, 27 Aug 2004)
New Revision: 2090

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/param&rev=2090&nolog=1

Log:
fix formatting that was bugging me
Modified:
   branches/SAMBA_3_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2004-08-27 15:56:04 UTC (rev 2089)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2004-08-27 16:13:50 UTC (rev 2090)
@@ -1199,24 +1199,18 @@
 		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->szPrintcommand, "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->szQueuepausecommand,
-				   "lpc stop '%p'");
-			string_set(&pService->szQueueresumecommand,
-				   "lpc start '%p'");
-			string_set(&pService->szLppausecommand,
-				   "lpc hold '%p' %j");
-			string_set(&pService->szLpresumecommand,
-				   "lpc release '%p' %j");
+			string_set(&pService->szPrintcommand, "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");
+			string_set(&pService->szLpresumecommand, "lpc release '%p' %j");
 			break;
 
 		case PRINT_CUPS:
@@ -1231,20 +1225,13 @@
 
 	                string_set(&Globals.szPrintcapname, "cups");
 #else
-			string_set(&pService->szLpqcommand,
-			           "/usr/bin/lpstat -o '%p'");
-			string_set(&pService->szLprmcommand,
-			           "/usr/bin/cancel '%p-%j'");
-			string_set(&pService->szPrintcommand,
-			           "/usr/bin/lp -d '%p' %s; rm %s");
-			string_set(&pService->szLppausecommand,
-				   "lp -i '%p-%j' -H hold");
-			string_set(&pService->szLpresumecommand,
-				   "lp -i '%p-%j' -H resume");
-			string_set(&pService->szQueuepausecommand,
-			           "/usr/bin/disable '%p'");
-			string_set(&pService->szQueueresumecommand,
-			           "/usr/bin/enable '%p'");
+			string_set(&pService->szLpqcommand, "/usr/bin/lpstat -o '%p'");
+			string_set(&pService->szLprmcommand, "/usr/bin/cancel '%p-%j'");
+			string_set(&pService->szPrintcommand, "/usr/bin/lp -d '%p' %s; rm %s");
+			string_set(&pService->szLppausecommand, "lp -i '%p-%j' -H hold");
+			string_set(&pService->szLpresumecommand, "lp -i '%p-%j' -H resume");
+			string_set(&pService->szQueuepausecommand, "/usr/bin/disable '%p'");
+			string_set(&pService->szQueueresumecommand, "/usr/bin/enable '%p'");
 			string_set(&Globals.szPrintcapname, "lpstat");
 #endif /* HAVE_CUPS */
 			break;
@@ -1253,17 +1240,12 @@
 		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->szQueuepausecommand,
-				   "disable %p");
-			string_set(&pService->szQueueresumecommand,
-				   "enable %p");
+			string_set(&pService->szPrintcommand, "lp -c -d%p %s; rm %s");
+			string_set(&pService->szQueuepausecommand, "disable %p");
+			string_set(&pService->szQueueresumecommand, "enable %p");
 #ifndef HPUX
-			string_set(&pService->szLppausecommand,
-				   "lp -i %p-%j -H hold");
-			string_set(&pService->szLpresumecommand,
-				   "lp -i %p-%j -H resume");
+			string_set(&pService->szLppausecommand, "lp -i %p-%j -H hold");
+			string_set(&pService->szLpresumecommand, "lp -i %p-%j -H resume");
 #endif /* HPUX */
 			break;
 



More information about the samba-cvs mailing list