Merge remote-tracking branch 'upstream/master'

3 files changed, 4 insertions, 4 deletions

diff --git a/src/cmd/lp/ipcopen.c b/src/cmd/lp/ipcopen.c
index 666f64c4..a07858a8 100644
--- a/src/cmd/lp/ipcopen.c
+++ b/src/cmd/lp/ipcopen.c
@@ -78,7 +78,7 @@ pass(int from, int to)
 {
 	char buf[1024];
 	int ppid, cpid;
-	int n, tot = 0; 
+	int n, tot = 0;
 
 	while ((n=read(from, buf, sizeof(buf))) > 0) {
 		if (n==1 && tot==0 && *buf=='\0')
diff --git a/src/cmd/lp/lpdsend.c b/src/cmd/lp/lpdsend.c
index 0dc70259..363d9501 100644
--- a/src/cmd/lp/lpdsend.c
+++ b/src/cmd/lp/lpdsend.c
@@ -289,7 +289,7 @@ main(int argc, char *argv[]) {
 			if (statflag) {
 				fprintf(stderr, "cannot have both -k and -q flags\n");
 				exit(1);
-			}	
+			}
 			killflag = 1;
 			killarg = optarg;
 			break;
@@ -297,7 +297,7 @@ main(int argc, char *argv[]) {
 			if (killflag) {
 				fprintf(stderr, "cannot have both -q and -k flags\n");
 				exit(1);
-			}	
+			}
 			statflag = 1;
 			break;
 		case 's':
diff --git a/src/cmd/lp/lpsend.c b/src/cmd/lp/lpsend.c
index 4893f452..bcdcfdbb 100644
--- a/src/cmd/lp/lpsend.c
+++ b/src/cmd/lp/lpsend.c
@@ -154,7 +154,7 @@ pass(int inpfd, int outfd, int bsize)
 	alarm(0);
 	return(bcnt);
 }
-	
+
 /* get whatever stdin has and put it into the temporary file.
  * return the file size.
  */