o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix gcc 4.8 warnings

Browse source 
LGTM=rsc
R=rsc
https://codereview.appspot.com/33240044
This commit is contained in:
David du Colombier 2014-03-03 22:30:34 +01:00
parent 24b8994d3d
commit 63002b3e5a
6 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cmd/devdraw/x11-draw.c
View file

@ -44,7 +44,7 @@ xdraw(Memdrawparam *par)
{ {
u32int sdval; u32int sdval;
uint m, state; uint m, state;
Memimage *src, *dst, *mask; Memimage *dst, *mask;
Point dp, mp; Point dp, mp;
Rectangle r; Rectangle r;
Xmem *xdst, *xmask; Xmem *xdst, *xmask;
@ -56,7 +56,6 @@ xdraw(Memdrawparam *par)
dst = par->dst; dst = par->dst;
mask = par->mask; mask = par->mask;
r = par->r; r = par->r;
src = par->src;
state = par->state; state = par->state;
/* /*

2
src/cmd/fontsrv/x11.c
View file

@ -113,7 +113,7 @@ mksubfont(char *name, int lo, int hi, int size, int antialias)
int i; int i;
Fontchar *fc, *fc0; Fontchar *fc, *fc0;
Memsubfont *sf; Memsubfont *sf;
Point rect_points[4]; //Point rect_points[4];
xf = nil; xf = nil;
for(xfp=xfont, xfe=xfont+nxfont; xfp != xfe; xfp++) { for(xfp=xfont, xfe=xfont+nxfont; xfp != xfe; xfp++) {

2
src/cmd/join.c
View file

@ -10,7 +10,7 @@
#define comp() runecmp(ppi[F1][j1],ppi[F2][j2]) #define comp() runecmp(ppi[F1][j1],ppi[F2][j2])
FILE *f[2]; FILE *f[2];
Rune buf[2][BUFSIZ]; /*input lines */ Rune buf[2][BUFSIZ]; /*input lines */
Rune *ppi[2][NFLD+1]; /* pointers to fields in lines */ Rune *ppi[4][NFLD+1]; /* pointers to fields in lines */
Rune *s1,*s2; Rune *s1,*s2;
#define j1 joinj1 #define j1 joinj1
#define j2 joinj2 #define j2 joinj2

3
src/cmd/postscript/tr2post/utils.c
View file

@ -242,9 +242,8 @@ runeout(Rune rune) {
void void
specialout(char *stoken) { specialout(char *stoken) {
Rune rune; Rune rune;
int i;
i = chartorune(&rune, stoken); chartorune(&rune, stoken);
glyphout(rune, stoken, TRUE); glyphout(rune, stoken, TRUE);
} }

2
src/cmd/rio/showevent/ShowEvent.c
View file

@ -761,7 +761,7 @@ void ShowEvent(XEvent *eev)
printf("type=%s%s", GetType((XEvent*)ev), sep); printf("type=%s%s", GetType((XEvent*)ev), sep);
printf("serial=%ld%s", ev->serial, sep); printf("serial=%ld%s", ev->serial, sep);
printf("send_event=%s%s", TorF(ev->send_event), sep); printf("send_event=%s%s", TorF(ev->send_event), sep);
printf("display=0x%x%s", (unsigned)ev->display, sep); printf("display=0x%p%s", ev->display, sep);
switch (ev->type) { switch (ev->type) {
case MotionNotify: case MotionNotify:

8
src/libventi/file.c
View file

@ -498,7 +498,6 @@ blockwalk(VtFile *r, VtBlock *p, int index, VtCache *c, int mode, VtEntry *e)
VtBlock *b; VtBlock *b;
int type, size; int type, size;
uchar *score; uchar *score;
VtEntry oe;
switch(p->type){ switch(p->type){
case VtDataType: case VtDataType:
@ -531,8 +530,6 @@ blockwalk(VtFile *r, VtBlock *p, int index, VtCache *c, int mode, VtEntry *e)
if(vtglobaltolocal(b->score) != NilBlock) if(vtglobaltolocal(b->score) != NilBlock)
return b; return b;
oe = *e;
/* /*
* Copy on write. * Copy on write.
*/ */
@ -560,7 +557,6 @@ static int
growdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth) growdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
{ {
VtBlock *b, *bb; VtBlock *b, *bb;
VtEntry oe;
assert(ISLOCKED(r)); assert(ISLOCKED(r));
assert(depth <= VtPointerDepth); assert(depth <= VtPointerDepth);
@ -569,8 +565,6 @@ growdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
if(b == nil) if(b == nil)
return -1; return -1;
oe = *e;
/* /*
* Keep adding layers until we get to the right depth * Keep adding layers until we get to the right depth
* or an error occurs. * or an error occurs.
@ -599,7 +593,6 @@ static int
shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth) shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
{ {
VtBlock *b, *nb, *ob, *rb; VtBlock *b, *nb, *ob, *rb;
VtEntry oe;
assert(ISLOCKED(r)); assert(ISLOCKED(r));
assert(depth <= VtPointerDepth); assert(depth <= VtPointerDepth);
@ -612,7 +605,6 @@ shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
* Walk down to the new root block. * Walk down to the new root block.
* We may stop early, but something is better than nothing. * We may stop early, but something is better than nothing.
*/ */
oe = *e;
ob = nil; ob = nil;
b = rb; b = rb;