Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.
diff --git a/src/cmd/draw/crop.c b/src/cmd/draw/crop.c
index e397a31..e0710d6 100644
--- a/src/cmd/draw/crop.c
+++ b/src/cmd/draw/crop.c
@@ -9,7 +9,7 @@
Inset, /* move border in or out uniformly */
Insetxy, /* move border in or out; different parameters for x and y */
Set, /* set rectangle to absolute values */
- Blank, /* cut off blank region according to color value */
+ Blank /* cut off blank region according to color value */
/* Blank is not actually set as a mode; it can be combined with others */
};
diff --git a/src/cmd/draw/gview.c b/src/cmd/draw/gview.c
index d935910..68b6ad4 100644
--- a/src/cmd/draw/gview.c
+++ b/src/cmd/draw/gview.c
@@ -13,7 +13,7 @@
enum {
But1 = Button_bit(1),/* mouse buttons for events */
But2 = Button_bit(2),
- But3 = Button_bit(3),
+ But3 = Button_bit(3)
};
int cantmv = 1; /* disallow rotate and move? 0..1 */
int top_border, bot_border, lft_border, rt_border;
@@ -911,7 +911,7 @@
#define Len_thous 30 /* bound on strlen(thous_nam[i]) */
char* thous_nam[Nthous] = {
"one", "thousand", "million", "billion",
- "trillion", "quadrillion", "quintillion",
+ "trillion", "quadrillion", "quintillion"
};
@@ -1966,6 +1966,8 @@
"Read a polygonal line graph in an ASCII format (one x y pair per line, delimited\n"
"by spaces with a label after each polyline), and view it interactively. Use\n"
"standard input if no infile is specified.\n"
+ );
+ fprintf(stderr,
"Option -l specifies a file in which to log the coordinates of each point selected.\n"
"(Clicking a point with button one selects it and displays its coordinates and\n"
"the label of its polylone.) Option -m allows polylines to be moved and rotated.\n"
diff --git a/src/cmd/draw/stats.c b/src/cmd/draw/stats.c
index a04a1c5..75069e2 100644
--- a/src/cmd/draw/stats.c
+++ b/src/cmd/draw/stats.c
@@ -23,7 +23,7 @@
Lx = 4, /* label tick length */
STACK = 8192,
- XSTACK = 32768,
+ XSTACK = 32768
};
enum
@@ -45,7 +45,7 @@
Vsys,
Vsyscall,
Vuser,
- Nvalue,
+ Nvalue
};
char*
@@ -67,7 +67,7 @@
"swap",
"sys",
"syscall",
- "user",
+ "user"
};
struct Graph
@@ -527,7 +527,7 @@
for(x=startx, i=0; i<nmach; i++,x+=dx){
draw(screen, Rect(x-1, starty-1, x, screen->r.max.y), display->black, nil, ZP);
j = dx/stringwidth(mediumfont, "0");
- // n = mach[i].nproc;
+ /* n = mach[i].nproc; */
n = 1;
if(n>1 && j>=1+3+(n>10)+(n>100)){ /* first char of name + (n) */
j -= 3+(n>10)+(n>100);
diff --git a/src/cmd/draw/tcolors.c b/src/cmd/draw/tcolors.c
index 8ce9002..150dbeb 100644
--- a/src/cmd/draw/tcolors.c
+++ b/src/cmd/draw/tcolors.c
@@ -7,7 +7,7 @@
enum
{
- STACK = 8192,
+ STACK = 8192
};
int nbit, npix;
diff --git a/src/cmd/draw/tweak.c b/src/cmd/draw/tweak.c
index 6f20a4f..1ee5d14 100644
--- a/src/cmd/draw/tweak.c
+++ b/src/cmd/draw/tweak.c
@@ -30,7 +30,7 @@
Up = 1,
Down = 0,
Mag = 4,
- Maxmag = 10,
+ Maxmag = 10
};
enum
@@ -49,12 +49,12 @@
Mchar,
Mpixels,
Mclose,
- Mexit,
+ Mexit
};
enum
{
- Blue = 54,
+ Blue = 54
};
char *menu3str[] = {
@@ -66,7 +66,7 @@
"pixels",
"close",
"exit",
- 0,
+ 0
};
Menu menu3 = {
