tcleanup - 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 e9254adc8f015c3ed422ce488801ed123c4a0749 (DIR) parent a699daf6afc17d8e7085b3cd2413f4d25ca689fe (HTM) Author: rsc <devnull@localhost> Date: Wed, 13 Jul 2005 13:44:40 +0000 cleanup Diffstat: M src/cmd/rio/client.c | 6 +++--- M src/cmd/rio/error.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) --- (DIR) diff --git a/src/cmd/rio/client.c b/src/cmd/rio/client.c t@@ -229,7 +229,7 @@ dump_revert(void) i = 0; for(c = current; c; c = c->revert){ - fprintf(stderr, "%s(%x:%d)", c->label ? c->label : "?", c->window, c->state); + fprintf(stderr, "%s(%x:%d)", c->label ? c->label : "?", (uint)c->window, c->state); if(i++ > 100) break; if(c->revert) t@@ -246,7 +246,7 @@ dump_clients(void) Client *c; for(c = clients; c; c = c->next) - fprintf(stderr, "w 0x%x parent 0x%x @ (%d, %d)\n", c->window, c->parent, c->x, c->y); + fprintf(stderr, "w 0x%x parent 0x%x @ (%d, %d)\n", (uint)c->window, (uint)c->parent, c->x, c->y); } #endif t@@ -263,7 +263,7 @@ shuffle(int up) for(l=&clients; (*l)->next; l=&(*l)->next) ; c = *l; - *l = nil; + *l = 0; c->next = clients; clients = c; XMapRaised(dpy, c->parent); (DIR) diff --git a/src/cmd/rio/error.c b/src/cmd/rio/error.c t@@ -85,9 +85,9 @@ graberror(char *f, int err) void dotrace(char *s, Client *c, XEvent *e) { - fprintf(stderr, "rio: %s: c=0x%x", s, c); + fprintf(stderr, "rio: %s: c=%p", s, c); if(c) - fprintf(stderr, " x %d y %d dx %d dy %d w 0x%x parent 0x%x", c->x, c->y, c->dx, c->dy, c->window, c->parent); + fprintf(stderr, " x %d y %d dx %d dy %d w 0x%x parent 0x%x", c->x, c->y, c->dx, c->dy, (uint)c->window, (uint)c->parent); #ifdef DEBUG_EV if(e){ fprintf(stderr, "\n\t");