diff options
author | David du Colombier <0intro@gmail.com> | 2014-03-03 22:30:34 +0100 |
---|---|---|
committer | David du Colombier <0intro@gmail.com> | 2014-03-03 22:30:34 +0100 |
commit | 63002b3e5ab034ff1317c21b994b803cd68a6eee (patch) | |
tree | 3cd18310b856864998bc34116275e8c4bff37eb7 /src/cmd | |
parent | 24b8994d3d3a30903b87c388114c7f5e7565d7fe (diff) | |
download | plan9port-63002b3e5ab034ff1317c21b994b803cd68a6eee.tar.gz plan9port-63002b3e5ab034ff1317c21b994b803cd68a6eee.tar.bz2 plan9port-63002b3e5ab034ff1317c21b994b803cd68a6eee.zip |
fix gcc 4.8 warnings
LGTM=rsc
R=rsc
https://codereview.appspot.com/33240044
Diffstat (limited to 'src/cmd')
-rw-r--r-- | src/cmd/devdraw/x11-draw.c | 3 | ||||
-rw-r--r-- | src/cmd/fontsrv/x11.c | 2 | ||||
-rw-r--r-- | src/cmd/join.c | 2 | ||||
-rw-r--r-- | src/cmd/postscript/tr2post/utils.c | 3 | ||||
-rw-r--r-- | src/cmd/rio/showevent/ShowEvent.c | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/src/cmd/devdraw/x11-draw.c b/src/cmd/devdraw/x11-draw.c index f4c1beaa..685ad88a 100644 --- a/src/cmd/devdraw/x11-draw.c +++ b/src/cmd/devdraw/x11-draw.c @@ -44,7 +44,7 @@ xdraw(Memdrawparam *par) { u32int sdval; uint m, state; - Memimage *src, *dst, *mask; + Memimage *dst, *mask; Point dp, mp; Rectangle r; Xmem *xdst, *xmask; @@ -56,7 +56,6 @@ xdraw(Memdrawparam *par) dst = par->dst; mask = par->mask; r = par->r; - src = par->src; state = par->state; /* diff --git a/src/cmd/fontsrv/x11.c b/src/cmd/fontsrv/x11.c index 01f2b965..a76ac2cf 100644 --- a/src/cmd/fontsrv/x11.c +++ b/src/cmd/fontsrv/x11.c @@ -113,7 +113,7 @@ mksubfont(char *name, int lo, int hi, int size, int antialias) int i; Fontchar *fc, *fc0; Memsubfont *sf; - Point rect_points[4]; + //Point rect_points[4]; xf = nil; for(xfp=xfont, xfe=xfont+nxfont; xfp != xfe; xfp++) { diff --git a/src/cmd/join.c b/src/cmd/join.c index 9ce127fe..263772f5 100644 --- a/src/cmd/join.c +++ b/src/cmd/join.c @@ -10,7 +10,7 @@ #define comp() runecmp(ppi[F1][j1],ppi[F2][j2]) FILE *f[2]; 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; #define j1 joinj1 #define j2 joinj2 diff --git a/src/cmd/postscript/tr2post/utils.c b/src/cmd/postscript/tr2post/utils.c index 9b51d036..f914a1c8 100644 --- a/src/cmd/postscript/tr2post/utils.c +++ b/src/cmd/postscript/tr2post/utils.c @@ -242,9 +242,8 @@ runeout(Rune rune) { void specialout(char *stoken) { Rune rune; - int i; - i = chartorune(&rune, stoken); + chartorune(&rune, stoken); glyphout(rune, stoken, TRUE); } diff --git a/src/cmd/rio/showevent/ShowEvent.c b/src/cmd/rio/showevent/ShowEvent.c index 7af9ded3..56f620d5 100644 --- a/src/cmd/rio/showevent/ShowEvent.c +++ b/src/cmd/rio/showevent/ShowEvent.c @@ -761,7 +761,7 @@ void ShowEvent(XEvent *eev) printf("type=%s%s", GetType((XEvent*)ev), sep); printf("serial=%ld%s", ev->serial, 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) { case MotionNotify: |