aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/rio
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2005-07-13 13:44:40 +0000
committerrsc <devnull@localhost>2005-07-13 13:44:40 +0000
commite9254adc8f015c3ed422ce488801ed123c4a0749 (patch)
tree454ca03e49ba5e8742a8af4012938cae45268c02 /src/cmd/rio
parenta699daf6afc17d8e7085b3cd2413f4d25ca689fe (diff)
downloadplan9port-e9254adc8f015c3ed422ce488801ed123c4a0749.tar.gz
plan9port-e9254adc8f015c3ed422ce488801ed123c4a0749.tar.bz2
plan9port-e9254adc8f015c3ed422ce488801ed123c4a0749.zip
cleanup
Diffstat (limited to 'src/cmd/rio')
-rw-r--r--src/cmd/rio/client.c6
-rw-r--r--src/cmd/rio/error.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd/rio/client.c b/src/cmd/rio/client.c
index 02db0e97..df8225fd 100644
--- a/src/cmd/rio/client.c
+++ b/src/cmd/rio/client.c
@@ -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)
@@ -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
@@ -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);
diff --git a/src/cmd/rio/error.c b/src/cmd/rio/error.c
index 1aeb7cde..a370b069 100644
--- a/src/cmd/rio/error.c
+++ b/src/cmd/rio/error.c
@@ -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");