From d7925b13e366aa667f80168728927751edd47151 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 14 Jan 2005 18:32:36 +0000
Subject: stupid sun

---
 src/cmd/bzip2/lib/bzdecompress.c |  4 +++-
 src/cmd/bzip2/lib/bzread.c       |  2 +-
 src/cmd/draw/gview.c             | 15 ++++++++++-----
 src/cmd/draw/tcolors.c           |  2 +-
 src/cmd/draw/tweak.c             |  2 +-
 src/cmd/gzip/gunzip.c            |  2 +-
 src/cmd/gzip/unzip.c             |  4 ----
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/cmd/bzip2/lib/bzdecompress.c b/src/cmd/bzip2/lib/bzdecompress.c
index 6483bc38..25ed9253 100644
--- 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
index 9532600f..8bd03888 100644
--- 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
index 0508d2dc..0909449d 100644
--- 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
index 60f49e68..76875f88 100644
--- 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
index 6d8ee26c..6f20a4fb 100644
--- 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
index 691827d3..3a1c058e 100644
--- 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
index 70e10a1a..af9a4ed2 100644
--- 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;
 }
 
 /*
-- 
cgit v1.2.3