tstupid sun - plan9port - [fork] Plan 9 from user space (HTM) git clone git://src.adamsgaard.dk/plan9port (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit d7925b13e366aa667f80168728927751edd47151 (DIR) parent 5a2171b2e8c79dc4dbc4f3b38331838c16192cb6 (HTM) Author: rsc <devnull@localhost> Date: Fri, 14 Jan 2005 18:32:36 +0000 stupid sun Diffstat: M src/cmd/bzip2/lib/bzdecompress.c | 4 +++- M src/cmd/bzip2/lib/bzread.c | 2 +- M src/cmd/draw/gview.c | 15 ++++++++++----- M src/cmd/draw/tcolors.c | 2 +- M src/cmd/draw/tweak.c | 2 +- M src/cmd/gzip/gunzip.c | 2 +- M src/cmd/gzip/unzip.c | 4 ---- 7 files changed, 17 insertions(+), 14 deletions(-) --- (DIR) diff --git a/src/cmd/bzip2/lib/bzdecompress.c b/src/cmd/bzip2/lib/bzdecompress.c t@@ -432,9 +432,11 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm ) } } +/* AssertH ( 0, 6001 ); - return 0; /*NOTREACHED*/ + return 0; +*/ } (DIR) diff --git a/src/cmd/bzip2/lib/bzread.c b/src/cmd/bzip2/lib/bzread.c t@@ -211,7 +211,7 @@ int BZ_API(BZ2_bzRead) } - return 0; /*not reached*/ + /* return 0; not reached*/ } (DIR) diff --git a/src/cmd/draw/gview.c b/src/cmd/draw/gview.c t@@ -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 */ (DIR) diff --git a/src/cmd/draw/tcolors.c b/src/cmd/draw/tcolors.c t@@ -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); (DIR) diff --git a/src/cmd/draw/tweak.c b/src/cmd/draw/tweak.c t@@ -853,7 +853,7 @@ type(char *buf, char *tag) p += runetochar(p, &r); } } - return 0; /* shut up compiler */ + /* return 0; shut up compiler */ } void (DIR) diff --git a/src/cmd/gzip/gunzip.c b/src/cmd/gzip/gunzip.c t@@ -210,7 +210,7 @@ gunzip(int ofd, char *ofile, Biobuf *bin) h.file = nil; gzok = Boffset(bin); } - return 0; +/* return 0; */ } static void (DIR) diff --git a/src/cmd/gzip/unzip.c b/src/cmd/gzip/unzip.c t@@ -261,8 +261,6 @@ sunztable(Biobuf *bin) free(zh.file); zh.file = nil; } - - return ok; } /* t@@ -331,8 +329,6 @@ sunzip(Biobuf *bin) if(eok < 0) return 0; } - - return 1; } /*