Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.

7 files changed, 16 insertions, 16 deletions

diff --git a/src/cmd/scat/bitinput.c b/src/cmd/scat/bitinput.c
index b4bd286b..ec37e0d6 100644
--- a/src/cmd/scat/bitinput.c
+++ b/src/cmd/scat/bitinput.c
@@ -11,7 +11,7 @@ static int hufvals[] = {
 	 3,  3,  3,  3,  5,  5,  5,  5,
 	10, 10, 10, 10, 12, 12, 12, 12,
 	15, 15, 15, 15,  6,  6,  7,  7,
-	 9,  9, 11, 11, 13, 13,  0, 14,
+	 9,  9, 11, 11, 13, 13,  0, 14
 };
 
 static int huflens[] = {
@@ -22,7 +22,7 @@ static int huflens[] = {
 	4, 4, 4, 4, 4, 4, 4, 4,
 	4, 4, 4, 4, 4, 4, 4, 4,
 	4, 4, 4, 4, 5, 5, 5, 5,
-	5, 5, 5, 5, 5, 5, 6, 6,
+	5, 5, 5, 5, 5, 5, 6, 6
 };
 
 static	int	buffer;
diff --git a/src/cmd/scat/desc.c b/src/cmd/scat/desc.c
index 968229cc..0cbf1de8 100644
--- a/src/cmd/scat/desc.c
+++ b/src/cmd/scat/desc.c
@@ -313,7 +313,7 @@ char *desctab[][2]={
 	"vs",	"very suddenly",
 	"vv",	"very very",
 	"zeta",	"ζ",
-	0,	0,
+	0,	0
 };
 
 /*&
diff --git a/src/cmd/scat/display.c b/src/cmd/scat/display.c
index 11642e59..739fca82 100644
--- a/src/cmd/scat/display.c
+++ b/src/cmd/scat/display.c
@@ -25,7 +25,7 @@ displaypic(Picture *pic)
 		close(p[1]);
 		dup(p[0], 0);
 		close(p[0]);
-	//	execl("/bin/page", "page", "-w", 0);
+	/*	execl("/bin/page", "page", "-w", 0); */
 		execlp("img", "img", 0);
 		fprint(2, "exec failed: %r\n");
 		exits("exec");
@@ -43,8 +43,8 @@ displaypic(Picture *pic)
 				i = n;
 			if(write(p[1], a, i)!=i)
 				fprint(2, "write error: %r\n");
-		//	if(i == 8192)	/* page aligned */
-		//		segfree(a, i);
+		/*	if(i == 8192)	/* page aligned */ */
+		/*		segfree(a, i); */
 			n -= i;
 			a += i;
 		}
@@ -74,7 +74,7 @@ displayimage(Image *im)
 		dup(p[0], 0);
 		close(p[0]);
 		execlp("img", "img", 0);
-	//	execl("/bin/page", "page", "-w", 0);
+	/*	execl("/bin/page", "page", "-w", 0); */
 		fprint(2, "exec failed: %r\n");
 		exits("exec");
 
diff --git a/src/cmd/scat/plate.h b/src/cmd/scat/plate.h
index 4d10bb5b..f2786f63 100644
--- a/src/cmd/scat/plate.h
+++ b/src/cmd/scat/plate.h
@@ -67,7 +67,7 @@ enum
 	Ppltdecd,
 	Ppltdecm,
 	Ppltdecs,
-	Pnparam,
+	Pnparam
 };
 
 typedef	struct	Plate	Plate;
diff --git a/src/cmd/scat/scat.c b/src/cmd/scat/scat.c
index 24ff4e20..f8c1ee6e 100644
--- a/src/cmd/scat/scat.c
+++ b/src/cmd/scat/scat.c
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
 	if(display != nil){
 		closedisplay(display);
 		/* automatic refresh of rio window is triggered by mouse */
-	//	close(open("/dev/mouse", OREAD));
+	/*	close(open("/dev/mouse", OREAD)); */
 	}
 	return;
 }
@@ -1338,7 +1338,7 @@ char *ngctypes[] =
 [Uncertain]	"?",
 [Nonexistent]	"-",
 [Unknown]	" ",
-[PlateDefect]	"PD",
+[PlateDefect]	"PD"
 };
 
 char*
diff --git a/src/cmd/scat/sky.h b/src/cmd/scat/sky.h
index cd2b6e86..53045853 100644
--- a/src/cmd/scat/sky.h
+++ b/src/cmd/scat/sky.h
@@ -63,7 +63,7 @@ typedef enum
 	/* internal */
 	NGCN,
 	PatchC,
-	NONGC,
+	NONGC
 }Type;
 
 enum
@@ -128,7 +128,7 @@ enum
 	Ppltdecd,
 	Ppltdecm,
 	Ppltdecs,
-	Pnparam,
+	Pnparam
 };
 
 #define	UNKNOWNMAG	32767
diff --git a/src/cmd/scat/strings.c b/src/cmd/scat/strings.c
index e60246c7..fa078f8d 100644
--- a/src/cmd/scat/strings.c
+++ b/src/cmd/scat/strings.c
@@ -1,13 +1,13 @@
 char *greek[]={ 0,	/* 1-indexed */
 	"alpha", "beta", "gamma", "delta", "epsilon", "zeta", "eta", "theta",
 	"iota", "kappa", "lambda", "mu", "nu", "xsi", "omicron", "pi", "rho",
-	"sigma", "tau", "upsilon", "phi", "chi", "psi", "omega",
+	"sigma", "tau", "upsilon", "phi", "chi", "psi", "omega"
 };
 
 Rune greeklet[]={ 0,
 	0x3b1, 0x3b2, 0x3b3, 0x3b4, 0x3b5, 0x3b6, 0x3b7, 0x3b8, 0x3b9, 0x3ba, 0x3bb,
 	0x3bc, 0x3bd, 0x3be, 0x3bf, 0x3c0, 0x3c1, 0x3c3, 0x3c4, 0x3c5, 0x3c6, 0x3c7,
-	0x3c8, 0x3c9,
+	0x3c8, 0x3c9
 };
 
 char *constel[]={ 0,	/* 1-indexed */
@@ -19,7 +19,7 @@ char *constel[]={ 0,	/* 1-indexed */
 	"lyn", "lyr", "men", "mic", "mon", "mus", "nor", "oct", "oph", "ori",
 	"pav", "peg", "per", "phe", "pic", "psa", "psc", "pup", "pyx", "ret",
 	"scl", "sco", "sct", "ser", "sex", "sge", "sgr", "tau", "tel", "tra",
-	"tri", "tuc", "uma", "umi", "vel", "vir", "vol", "vul",
+	"tri", "tuc", "uma", "umi", "vel", "vir", "vol", "vul"
 };
 Name names[]={
 	"gx",	Galaxy,
@@ -48,5 +48,5 @@ Name names[]={
 	"nonexistent",	Nonexistent,
 	"unknown",	Unknown,
 	"platedefect",	PlateDefect,
-	0,		0,
+	0,		0
 };