diff options
author | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-01-07 04:44:13 +0100 |
---|---|---|
committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-01-07 04:44:13 +0100 |
commit | 772afbe98c7e74be35e7e5318967ce594e4d93e8 (patch) | |
tree | 006ef64214c4ab980ff3125ea812f42235706b5b /sys/src/9 | |
parent | 9c99d0c8d3236b87bd292ac29d4d1b2d5f550bd5 (diff) |
format pointer subtraction results with %zd instead of %ld (for long -> intptr on amd64)
Diffstat (limited to 'sys/src/9')
-rw-r--r-- | sys/src/9/ip/esp.c | 2 | ||||
-rw-r--r-- | sys/src/9/pc/archmp.c | 2 | ||||
-rw-r--r-- | sys/src/9/pc/etherrt2860.c | 2 | ||||
-rw-r--r-- | sys/src/9/port/devaoe.c | 4 | ||||
-rw-r--r-- | sys/src/9/port/devtls.c | 4 | ||||
-rw-r--r-- | sys/src/9/port/proc.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sys/src/9/ip/esp.c b/sys/src/9/ip/esp.c index 19a6554f3..9023e08a5 100644 --- a/sys/src/9/ip/esp.c +++ b/sys/src/9/ip/esp.c @@ -511,7 +511,7 @@ print("esp: bad auth %I -> %I!%ld\n", vers.raddr, vers.laddr, vers.spi); payload = BLEN(bp) - vers.hdrlen - ecb->ahlen; if(payload <= 0 || payload % 4 != 0 || payload % ecb->espblklen != 0) { qunlock(c); - netlog(f, Logesp, "esp: bad length %I -> %I!%lud payload=%d BLEN=%lud\n", + netlog(f, Logesp, "esp: bad length %I -> %I!%lud payload=%d BLEN=%zd\n", vers.raddr, vers.laddr, vers.spi, payload, BLEN(bp)); freeb(bp); return; diff --git a/sys/src/9/pc/archmp.c b/sys/src/9/pc/archmp.c index 6e7aa3de9..18e19e120 100644 --- a/sys/src/9/pc/archmp.c +++ b/sys/src/9/pc/archmp.c @@ -310,7 +310,7 @@ pcmpinit(void) */ while(p < e) switch(*p){ default: - print("pcmpinit: unknown PCMP type 0x%uX (e-p 0x%luX)\n", + print("pcmpinit: unknown PCMP type 0x%uX (e-p 0x%zuX)\n", *p, e-p); while(p < e){ print("%uX ", *p); diff --git a/sys/src/9/pc/etherrt2860.c b/sys/src/9/pc/etherrt2860.c index 6544a80a7..7d71d612f 100644 --- a/sys/src/9/pc/etherrt2860.c +++ b/sys/src/9/pc/etherrt2860.c @@ -2658,7 +2658,7 @@ transmit(Wifi *wifi, Wnode *wn, Block *b) p = pool->p + pool->i * TxwiDmaSz; w = (Wifipkt*)(p + Txwisize); if(ctlr->wifi->debug){ - print("transmit: %E->%E,%E nodeid=%x txq[%d]=%d size=%ld\n", w->a2, w->a1, w->a3, nodeid, qid, ctlr->tx[qid].i, BLEN(outb)); + print("transmit: %E->%E,%E nodeid=%x txq[%d]=%d size=%zd\n", w->a2, w->a1, w->a3, nodeid, qid, ctlr->tx[qid].i, BLEN(outb)); } tx->i = (tx->i + 1) % Ntx; diff --git a/sys/src/9/port/devaoe.c b/sys/src/9/port/devaoe.c index 68d66c25d..5c01c922d 100644 --- a/sys/src/9/port/devaoe.c +++ b/sys/src/9/port/devaoe.c @@ -2141,7 +2141,7 @@ atarsp(Block *b) case Crd: case Crdext: if(BLEN(b) - (Aoehsz + Aoeatasz) != n){ - eventlog("%æ: misread blen %ld expect %d\n", + eventlog("%æ: misread blen %zd expect %d\n", d, BLEN(b), n); goto bail; } @@ -2159,7 +2159,7 @@ atarsp(Block *b) break; case Cid: if(BLEN(b) - (Aoehsz + Aoeatasz) < 512){ - eventlog("%æ: runt identify blen %ld expect %d\n", + eventlog("%æ: runt identify blen %zd expect %d\n", d, BLEN(b), 512 + Aoehsz + Aoeatasz); goto bail; } diff --git a/sys/src/9/port/devtls.c b/sys/src/9/port/devtls.c index 7511a7654..2b5cc9304 100644 --- a/sys/src/9/port/devtls.c +++ b/sys/src/9/port/devtls.c @@ -1115,7 +1115,7 @@ tlsbread(Chan *c, long n, ulong offset) /* return at most what was asked for */ b = qgrab(&tr->processed, n); -if(tr->debug) pprint("consumed processed %ld\n", BLEN(b)); +if(tr->debug) pprint("consumed processed %zd\n", BLEN(b)); if(tr->debug) pdump(BLEN(b), b->rp, "consumed:"); qunlock(&tr->in.io); poperror(); @@ -1272,7 +1272,7 @@ tlsrecwrite(TlsRec *tr, int type, Block *b) nexterror(); } qlock(&out->io); -if(tr->debug)pprint("send %ld\n", BLEN(b)); +if(tr->debug)pprint("send %zd\n", BLEN(b)); if(tr->debug)pdump(BLEN(b), b->rp, "sent:"); diff --git a/sys/src/9/port/proc.c b/sys/src/9/port/proc.c index eadca93ec..412a8eef9 100644 --- a/sys/src/9/port/proc.c +++ b/sys/src/9/port/proc.c @@ -1362,7 +1362,7 @@ scheddump(void) for(rq = &runq[Nrq-1]; rq >= runq; rq--){ if(rq->head == nil) continue; - print("rq%ld:", rq-runq); + print("rq%zd:", rq-runq); for(p = rq->head; p != nil; p = p->rnext) print(" %lud(%lud)", p->pid, m->ticks - p->readytime); print("\n"); |