commit d7925b13e366aa667f80168728927751edd47151 from: rsc date: Fri Jan 14 18:32:36 2005 UTC stupid sun commit - 5a2171b2e8c79dc4dbc4f3b38331838c16192cb6 commit + d7925b13e366aa667f80168728927751edd47151 blob - 6483bc38d460f6e6062c42b0365a75d30753c6fa blob + 25ed925360f273179b360a56e590f5c50f648ad5 --- src/cmd/bzip2/lib/bzdecompress.c +++ 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; +*/ } blob - 9532600f6b8c7985784a4ae1348dd6670fae8ad3 blob + 8bd03888d0e7f2a91391b287a66c306c84064eec --- src/cmd/bzip2/lib/bzread.c +++ src/cmd/bzip2/lib/bzread.c @@ -211,7 +211,7 @@ int BZ_API(BZ2_bzRead) } - return 0; /*not reached*/ + /* return 0; not reached*/ } blob - 0508d2dcf5fa23ab1c61961296e098c7307ddb58 blob + 0909449de84e071bfbe8d8366e31b74d4ea7b969 --- src/cmd/draw/gview.c +++ 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 */ blob - 60f49e68a15f1cc3f6ad62e6281014e384dc9c41 blob + 76875f888139b52af8d2f2594c7c3d68a5a9f68a --- src/cmd/draw/tcolors.c +++ 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); blob - 6d8ee26cab2217d43c5a5839713c96b19732c77d blob + 6f20a4fb3832e087538e29832ae895a8fb3b9e50 --- src/cmd/draw/tweak.c +++ 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 blob - 691827d3fc4174c17caea2d6593e2629b0c3a962 blob + 3a1c058ebc51089ca977dc30d34464241e33d69b --- src/cmd/gzip/gunzip.c +++ 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 blob - 70e10a1aa3f5b45d238dce8bb57b02ba8724eb58 blob + af9a4ed2e614118cfc948480c5b9f8e3710e57f6 --- src/cmd/gzip/unzip.c +++ 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; } /*