commit d7925b13e366aa667f80168728927751edd47151
parent 5a2171b2e8c79dc4dbc4f3b38331838c16192cb6
Author: rsc <devnull@localhost>
Date: Fri, 14 Jan 2005 18:32:36 +0000
stupid sun
Diffstat:
7 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/cmd/bzip2/lib/bzdecompress.c b/src/cmd/bzip2/lib/bzdecompress.c
@@ -432,9 +432,11 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
}
}
+/*
AssertH ( 0, 6001 );
- return 0; /*NOTREACHED*/
+ return 0;
+*/
}
diff --git a/src/cmd/bzip2/lib/bzread.c b/src/cmd/bzip2/lib/bzread.c
@@ -211,7 +211,7 @@ int BZ_API(BZ2_bzRead)
}
- return 0; /*not reached*/
+ /* return 0; not reached*/
}
diff --git a/src/cmd/draw/gview.c b/src/cmd/draw/gview.c
@@ -155,12 +155,17 @@ void latest_mouse(int but, Mouse* m)
/*********************************** Colors ***********************************/
-enum { DOrange=0xffaa00FF, Dgray=0xbbbbbbFF, DDkgreen=0x009900FF,
- DDkred=0xcc0000FF, DViolet=0x990099FF, DDkyellow=0xaaaa00FF,
- DLtblue=0xaaaaffFF, DPink=0xffaaaaFF,
- /* ndraw.h sets DBlack, DBlue, DRed, DYellow, DGreen,
+#define DOrange 0xFFAA00FF
+#define Dgray 0xBBBBBBFF
+#define DDkgreen 0x009900FF
+#define DDkred 0xCC0000FF
+#define DViolet 0x990099FF
+#define DDkyellow 0xAAAA00FF
+#define DLtblue 0xAAAAFFFF
+#define DPink 0xFFAAAAFF
+
+ /* draw.h sets DBlack, DBlue, DRed, DYellow, DGreen,
DCyan, DMagenta, DWhite */
-};
typedef struct color_ref {
ulong c; /* RGBA pixel color */
diff --git a/src/cmd/draw/tcolors.c b/src/cmd/draw/tcolors.c
@@ -68,7 +68,7 @@ threadmain(int argc, char *argv[])
exits("usage");
}
- if(initdraw(nil, nil, "colors") < 0)
+ if(initdraw(0, nil, "colors") < 0)
sysfatal("initdraw failed: %r");
mousectl = initmouse(nil, display->image);
diff --git a/src/cmd/draw/tweak.c b/src/cmd/draw/tweak.c
@@ -853,7 +853,7 @@ type(char *buf, char *tag)
p += runetochar(p, &r);
}
}
- return 0; /* shut up compiler */
+ /* return 0; shut up compiler */
}
void
diff --git a/src/cmd/gzip/gunzip.c b/src/cmd/gzip/gunzip.c
@@ -210,7 +210,7 @@ gunzip(int ofd, char *ofile, Biobuf *bin)
h.file = nil;
gzok = Boffset(bin);
}
- return 0;
+/* return 0; */
}
static void
diff --git a/src/cmd/gzip/unzip.c b/src/cmd/gzip/unzip.c
@@ -261,8 +261,6 @@ sunztable(Biobuf *bin)
free(zh.file);
zh.file = nil;
}
-
- return ok;
}
/*
@@ -331,8 +329,6 @@ sunzip(Biobuf *bin)
if(eok < 0)
return 0;
}
-
- return 1;
}
/*
