commit - 24b8994d3d3a30903b87c388114c7f5e7565d7fe
commit + 63002b3e5ab034ff1317c21b994b803cd68a6eee
blob - f4c1beaaef024ff5e64fc522b43959f7dbf772fc
blob + 685ad88a76492416061b07d903a138ff74318265
--- src/cmd/devdraw/x11-draw.c
+++ src/cmd/devdraw/x11-draw.c
{
u32int sdval;
uint m, state;
- Memimage *src, *dst, *mask;
+ Memimage *dst, *mask;
Point dp, mp;
Rectangle r;
Xmem *xdst, *xmask;
dst = par->dst;
mask = par->mask;
r = par->r;
- src = par->src;
state = par->state;
/*
blob - 01f2b9654753a4e94b55a9dfa38e34c8c82aa065
blob + a76ac2cf890e18e05a36b0025bbe70fbed5f8d9c
--- src/cmd/fontsrv/x11.c
+++ src/cmd/fontsrv/x11.c
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++) {
blob - 9ce127fec0b1aa77fd0c16d11b70cc1b1e8bccd7
blob + 263772f5396e7d3fe6e940b4cea6156bd704efac
--- src/cmd/join.c
+++ src/cmd/join.c
#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
blob - 9b51d036f3a5fcadb86bf405342ccc1c22265e85
blob + f914a1c87209b1be3835b5fd7f2a57ff6866d37c
--- src/cmd/postscript/tr2post/utils.c
+++ src/cmd/postscript/tr2post/utils.c
void
specialout(char *stoken) {
Rune rune;
- int i;
- i = chartorune(&rune, stoken);
+ chartorune(&rune, stoken);
glyphout(rune, stoken, TRUE);
}
blob - 7af9ded3e6f7be1ef7be354bfe8f60ff49a0471c
blob + 56f620d5284c6cd434dd04099b7be9899a83597c
--- src/cmd/rio/showevent/ShowEvent.c
+++ src/cmd/rio/showevent/ShowEvent.c
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:
blob - ec9c1b7eda2caf328b86ff6c7de825e7ae38c68e
blob + e97df39c6ab8e6e03769cbd27829faac5b934f3f
--- src/libventi/file.c
+++ src/libventi/file.c
VtBlock *b;
int type, size;
uchar *score;
- VtEntry oe;
switch(p->type){
case VtDataType:
if(vtglobaltolocal(b->score) != NilBlock)
return b;
-
- oe = *e;
/*
* Copy on write.
growdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
{
VtBlock *b, *bb;
- VtEntry oe;
assert(ISLOCKED(r));
assert(depth <= VtPointerDepth);
b = vtcacheglobal(r->c, e->score, e->type, r->dsize);
if(b == nil)
return -1;
-
- oe = *e;
/*
* Keep adding layers until we get to the right depth
shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
{
VtBlock *b, *nb, *ob, *rb;
- VtEntry oe;
assert(ISLOCKED(r));
assert(depth <= VtPointerDepth);
* Walk down to the new root block.
* We may stop early, but something is better than nothing.
*/
- oe = *e;
ob = nil;
b = rb;