Browse Source

fixfmt: The final final set of changes.

I missed %lud and %llud somehow. Still boots and
output from du -s makes more sense.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 4 years ago
parent
commit
6c10e3e0c0
61 changed files with 107 additions and 107 deletions
  1. 5 5
      sys/src/9/386/ether8169.c
  2. 1 1
      sys/src/9/386/etherigbe.c
  3. 1 1
      sys/src/9/386/sdiahci.c
  4. 1 1
      sys/src/9/amd64/archamd64.c
  5. 1 1
      sys/src/9/amd64/asm.c
  6. 1 1
      sys/src/9/amd64/ether82563.c
  7. 1 1
      sys/src/9/amd64/multiboot.c
  8. 1 1
      sys/src/9/amd64/physalloc.c
  9. 2 2
      sys/src/9/amd64/qmalloc.c
  10. 1 1
      sys/src/9/amd64/trap.c
  11. 1 1
      sys/src/9/ip/esp.c
  12. 1 1
      sys/src/9/ip/ip.c
  13. 1 1
      sys/src/9/ip/tcp.c
  14. 2 2
      sys/src/9/ip/udp.c
  15. 2 2
      sys/src/9/port/devsd.c
  16. 1 1
      sys/src/9/port/devtls.c
  17. 1 1
      sys/src/9/port/image.c
  18. 8 8
      sys/src/9/port/netif.c
  19. 1 1
      sys/src/9/port/sdscsi.c
  20. 1 1
      sys/src/9/port/tod.c
  21. 1 1
      sys/src/9/root/blow.c
  22. 1 1
      sys/src/9/root/suck.c
  23. 1 1
      sys/src/cmd/acid/builtin.c
  24. 2 2
      sys/src/cmd/aquarela/smbcomlocking.c
  25. 1 1
      sys/src/cmd/aquarela/smbcomopen.c
  26. 1 1
      sys/src/cmd/aux/ms2.c
  27. 1 1
      sys/src/cmd/aux/timesync.c
  28. 1 1
      sys/src/cmd/cfs/cfs.c
  29. 3 3
      sys/src/cmd/cfs/inode.c
  30. 2 2
      sys/src/cmd/cifs/transnt.c
  31. 2 2
      sys/src/cmd/cwfs/chk.c
  32. 3 3
      sys/src/cmd/cwfs/iobuf.c
  33. 1 1
      sys/src/cmd/dd.c
  34. 5 5
      sys/src/cmd/disk/9660/cdrdwr.c
  35. 1 1
      sys/src/cmd/disk/9660/conform.c
  36. 1 1
      sys/src/cmd/disk/9660/dump9660.c
  37. 1 1
      sys/src/cmd/disk/9660/sysuse.c
  38. 2 2
      sys/src/cmd/disk/mkext.c
  39. 1 1
      sys/src/cmd/disk/prep/prep.c
  40. 1 1
      sys/src/cmd/du.c
  41. 4 4
      sys/src/cmd/ecp.c
  42. 1 1
      sys/src/cmd/fossil/9fsys.c
  43. 1 1
      sys/src/cmd/fossil/source.c
  44. 1 1
      sys/src/cmd/fossil/srcload.c
  45. 1 1
      sys/src/cmd/fossil/view.c
  46. 1 1
      sys/src/cmd/ip/dhcpd/dhcpd.c
  47. 2 2
      sys/src/cmd/ls.c
  48. 1 1
      sys/src/cmd/ratfs/main.c
  49. 1 1
      sys/src/cmd/stats.c
  50. 1 1
      sys/src/cmd/tarsplit/tarsub.c
  51. 1 1
      sys/src/cmd/venti/srv/arenas.c
  52. 1 1
      sys/src/cmd/venti/srv/buildbuck.c
  53. 8 8
      sys/src/cmd/venti/srv/clump.c
  54. 1 1
      sys/src/cmd/venti/srv/httpd.c
  55. 1 1
      sys/src/cmd/venti/srv/icachewrite.c
  56. 7 7
      sys/src/cmd/venti/srv/printarena.c
  57. 2 2
      sys/src/cmd/venti/srv/wrarena.c
  58. 1 1
      sys/src/libmp/test.c
  59. 2 2
      sys/src/libusb/disk/disk.c
  60. 2 2
      sys/src/libusb/disk/scsireq.c
  61. 1 1
      sys/src/libventi/file.c

+ 5 - 5
sys/src/9/386/ether8169.c

@@ -552,16 +552,16 @@ rtl8169ifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 		error(Enomem);
 	e = p + READSTR;
 
-	l = snprint(p, READSTR, "TxOk: %llud\n", dtcc->txok);
-	l += snprint(p+l, READSTR-l, "RxOk: %llud\n", dtcc->rxok);
-	l += snprint(p+l, READSTR-l, "TxEr: %llud\n", dtcc->txer);
+	l = snprint(p, READSTR, "TxOk: %llu\n", dtcc->txok);
+	l += snprint(p+l, READSTR-l, "RxOk: %llu\n", dtcc->rxok);
+	l += snprint(p+l, READSTR-l, "TxEr: %llu\n", dtcc->txer);
 	l += snprint(p+l, READSTR-l, "RxEr: %u\n", dtcc->rxer);
 	l += snprint(p+l, READSTR-l, "MissPkt: %u\n", dtcc->misspkt);
 	l += snprint(p+l, READSTR-l, "FAE: %u\n", dtcc->fae);
 	l += snprint(p+l, READSTR-l, "Tx1Col: %u\n", dtcc->tx1col);
 	l += snprint(p+l, READSTR-l, "TxMCol: %u\n", dtcc->txmcol);
-	l += snprint(p+l, READSTR-l, "RxOkPh: %llud\n", dtcc->rxokph);
-	l += snprint(p+l, READSTR-l, "RxOkBrd: %llud\n", dtcc->rxokbrd);
+	l += snprint(p+l, READSTR-l, "RxOkPh: %llu\n", dtcc->rxokph);
+	l += snprint(p+l, READSTR-l, "RxOkBrd: %llu\n", dtcc->rxokbrd);
 	l += snprint(p+l, READSTR-l, "RxOkMu: %u\n", dtcc->rxokmu);
 	l += snprint(p+l, READSTR-l, "TxAbt: %u\n", dtcc->txabt);
 	l += snprint(p+l, READSTR-l, "TxUndrn: %u\n", dtcc->txundrn);

+ 1 - 1
sys/src/9/386/etherigbe.c

@@ -638,7 +638,7 @@ igbeifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 				continue;
 			ctlr->statistics[i] = tuvl;
 			ctlr->statistics[i+1] = tuvl>>32;
-			l += snprint(p+l, READSTR-l, "%s: %llud %llud\n",
+			l += snprint(p+l, READSTR-l, "%s: %llu %llu\n",
 				s, tuvl, ruvl);
 			i++;
 			break;

+ 1 - 1
sys/src/9/386/sdiahci.c

@@ -2194,7 +2194,7 @@ print("iarctl: nil u->dev->ctlr\n");
 		o->ci, o->isr, o->sig, o->sstatus);
 	if(d->unit == nil)
 		panic("iarctl: nil d->unit");
-	p = seprint(p, e, "geometry %llud %lu\n", d->sectors, d->unit->secsize);
+	p = seprint(p, e, "geometry %llu %lu\n", d->sectors, d->unit->secsize);
 	return p - op;
 }
 

+ 1 - 1
sys/src/9/amd64/archamd64.c

@@ -333,7 +333,7 @@ fmtP(Fmt* f)
 	if(f->flags & FmtSharp)
 		return fmtprint(f, "%#16.16llux", pa);
 
-	return fmtprint(f, "%llud", pa);
+	return fmtprint(f, "%llu", pa);
 }
 
 static int

+ 1 - 1
sys/src/9/amd64/asm.c

@@ -426,7 +426,7 @@ asmmeminit(void)
 	conf.upages = conf.npage;
 	i = (sys->vmend - sys->vmstart)/PGSZ;		/* close enough */
 	conf.ialloc = (i/2)*PGSZ;
-	print("npage %llud upage %lu kpage %d\n",
+	print("npage %llu upage %lu kpage %d\n",
 		conf.npage, conf.upages, i);
 
 #endif /* ConfCrap */

+ 1 - 1
sys/src/9/amd64/ether82563.c

@@ -695,7 +695,7 @@ i82563ifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 				continue;
 			ctlr->statistics[i] = tuvl;
 			ctlr->statistics[i+1] = tuvl >> 32;
-			p = seprint(p, e, "%s: %llud %llud\n", stat, tuvl, ruvl);
+			p = seprint(p, e, "%s: %llu %llu\n", stat, tuvl, ruvl);
 			i++;
 			break;
 

+ 1 - 1
sys/src/9/amd64/multiboot.c

@@ -140,7 +140,7 @@ multiboot(uint32_t magic, uint32_t pmbi, int vflag)
 				break;
 			}
 			if(vflag)
-				print("\n\t%#16.16llux %#16.16llux (%llud)\n",
+				print("\n\t%#16.16llux %#16.16llux (%llu)\n",
 					addr, addr+len, len);
 
 			n += mmap->size+sizeof(mmap->size);

+ 1 - 1
sys/src/9/amd64/physalloc.c

@@ -514,7 +514,7 @@ physinit(uintmem a, uint64_t size)
 			if(!ISPOWEROF2(sys->pmend))
 				b->kspan++;
 			dtsz = sizeof(Buddy)*(UNO<<(b->kspan-b->kmin+1));
-			DBG("kspan %u (arrysz = %llud)\n", b->kspan, dtsz);
+			DBG("kspan %u (arrysz = %llu)\n", b->kspan, dtsz);
 			b->blocks = malloc(dtsz);
 			if(b->blocks == nil)
 				panic("physinit: no blocks");

+ 2 - 2
sys/src/9/amd64/qmalloc.c

@@ -404,9 +404,9 @@ mallocreadfmt(char* s, char* e)
 	Qlist *qlist;
 
 	p = seprint(s, e,
-		"%llud memory\n"
+		"%llu memory\n"
 		"%d pagesize\n"
-		"%llud kernel\n",
+		"%llu kernel\n",
 		(uint64_t)conf.npage*PGSZ,
 		PGSZ,
 		(uint64_t)conf.npage-conf.upages);

+ 1 - 1
sys/src/9/amd64/trap.c

@@ -662,7 +662,7 @@ doublefault(Ureg* ureg, void* v)
 static void
 unexpected(Ureg* ureg, void* v)
 {
-	iprint("unexpected trap %llud; ignoring\n", ureg->type);
+	iprint("unexpected trap %llu; ignoring\n", ureg->type);
 }
 
 static void

+ 1 - 1
sys/src/9/ip/esp.c

@@ -623,7 +623,7 @@ espstats(Proto *esp, char *buf, int len)
 	Esppriv *upriv;
 
 	upriv = esp->priv;
-	return snprint(buf, len, "%llud %lu\n",
+	return snprint(buf, len, "%llu %lu\n",
 		upriv->in,
 		upriv->inerrors);
 }

+ 1 - 1
sys/src/9/ip/ip.c

@@ -475,7 +475,7 @@ ipstats(Fs *f, char *buf, int len)
 	p = buf;
 	e = p+len;
 	for(i = 0; i < Nipstats; i++)
-		p = seprint(p, e, "%s: %llud\n", statnames[i], ip->stats[i]);
+		p = seprint(p, e, "%s: %llu\n", statnames[i], ip->stats[i]);
 	return p - buf;
 }
 

+ 1 - 1
sys/src/9/ip/tcp.c

@@ -3330,7 +3330,7 @@ tcpstats(Proto *tcp, char *buf, int len)
 	p = buf;
 	e = p+len;
 	for(i = 0; i < Nstats; i++)
-		p = seprint(p, e, "%s: %llud\n", statnames[i], priv->stats[i]);
+		p = seprint(p, e, "%s: %llu\n", statnames[i], priv->stats[i]);
 	return p - buf;
 }
 

+ 2 - 2
sys/src/9/ip/udp.c

@@ -596,8 +596,8 @@ udpstats(Proto *udp, char *buf, int len)
 	Udppriv *upriv;
 
 	upriv = udp->priv;
-	return snprint(buf, len, "InDatagrams: %llud\nNoPorts: %lu\n"
-		"InErrors: %lu\nOutDatagrams: %llud\n",
+	return snprint(buf, len, "InDatagrams: %llu\nNoPorts: %lu\n"
+		"InErrors: %lu\nOutDatagrams: %llu\n",
 		upriv->ustats.udpInDatagrams,
 		upriv->ustats.udpNoPorts,
 		upriv->ustats.udpInErrors,

+ 2 - 2
sys/src/9/port/devsd.c

@@ -1161,13 +1161,13 @@ sdread(Chan *c, void *a, int32_t n, int64_t off)
 		if(unit->sectors){
 			if(unit->dev->ifc->rctl == nil)
 				l += snprint(p+l, mm-l,
-					"geometry %llud %lu\n",
+					"geometry %llu %lu\n",
 					unit->sectors, unit->secsize);
 			pp = unit->part;
 			for(i = 0; i < unit->npart; i++){
 				if(pp->valid)
 					l += snprint(p+l, mm-l,
-						"part %s %llud %llud\n",
+						"part %s %llu %llu\n",
 						pp->SDperm.name, pp->start, pp->end);
 				pp++;
 			}

+ 1 - 1
sys/src/9/port/devtls.c

@@ -1196,7 +1196,7 @@ tlsread(Chan *c, void *a, int32_t n, int64_t off)
 		return n;
 	case Qctl:
 		buf = smalloc(Statlen);
-		snprint(buf, Statlen, "%llud", CONV(c->qid));
+		snprint(buf, Statlen, "%llu", CONV(c->qid));
 		n = readstr(offset, a, n, buf);
 		free(buf);
 		return n;

+ 1 - 1
sys/src/9/port/image.c

@@ -178,7 +178,7 @@ imagereclaim(void)
 	irstats.ticks += ticks;
 	if(ticks > irstats.maxt)
 		irstats.maxt = ticks;
-	//print("T%llud+", ticks);
+	//print("T%llu+", ticks);
 	qunlock(&imagealloc.ireclaim);
 }
 

+ 8 - 8
sys/src/9/port/netif.c

@@ -237,15 +237,15 @@ netifread(Netif *nif, Chan *c, void *a, int32_t n, int64_t off)
 		p = malloc(READSTR);
 		if(p == nil)
 			error(Enomem);
-		j = snprint(p, READSTR, "in: %llud\n", nif->inpackets);
+		j = snprint(p, READSTR, "in: %llu\n", nif->inpackets);
 		j += snprint(p+j, READSTR-j, "link: %d\n", nif->link);
-		j += snprint(p+j, READSTR-j, "out: %llud\n", nif->outpackets);
-		j += snprint(p+j, READSTR-j, "crc errs: %llud\n", nif->crcs);
-		j += snprint(p+j, READSTR-j, "overflows: %llud\n", nif->overflows);
-		j += snprint(p+j, READSTR-j, "soft overflows: %llud\n", nif->soverflows);
-		j += snprint(p+j, READSTR-j, "framing errs: %llud\n", nif->frames);
-		j += snprint(p+j, READSTR-j, "buffer errs: %llud\n", nif->buffs);
-		j += snprint(p+j, READSTR-j, "output errs: %llud\n", nif->oerrs);
+		j += snprint(p+j, READSTR-j, "out: %llu\n", nif->outpackets);
+		j += snprint(p+j, READSTR-j, "crc errs: %llu\n", nif->crcs);
+		j += snprint(p+j, READSTR-j, "overflows: %llu\n", nif->overflows);
+		j += snprint(p+j, READSTR-j, "soft overflows: %llu\n", nif->soverflows);
+		j += snprint(p+j, READSTR-j, "framing errs: %llu\n", nif->frames);
+		j += snprint(p+j, READSTR-j, "buffer errs: %llu\n", nif->buffs);
+		j += snprint(p+j, READSTR-j, "output errs: %llu\n", nif->oerrs);
 		j += snprint(p+j, READSTR-j, "prom: %d\n", nif->prom);
 		j += snprint(p+j, READSTR-j, "mbps: %d\n", nif->mbps);
 		j += snprint(p+j, READSTR-j, "addr: ");

+ 1 - 1
sys/src/9/port/sdscsi.c

@@ -403,7 +403,7 @@ again:
 		default:
 			break;
 		case 0x01:		/* recovered error */
-			print("%s: recovered error at sector %llud\n",
+			print("%s: recovered error at sector %llu\n",
 				unit->SDperm.name, bno);
 			rlen = r->rlen;
 			break;

+ 1 - 1
sys/src/9/port/tod.c

@@ -207,7 +207,7 @@ todfix(void)
 
 		/* convert to epoch */
 		mul64fract(&x, diff, tod.multiplier);
-if(x > 30000000000ULL) print("todfix %llud\n", x);
+if(x > 30000000000ULL) print("todfix %llu\n", x);
 		x += tod.off;
 
 		/* protect against overflows */

+ 1 - 1
sys/src/9/root/blow.c

@@ -241,7 +241,7 @@ main(int argc, char* argv[])
 	r *= mhz;
 	r /= stop - start;
 
-	print("%d writes of %d in %llud cycles @ %dMHz = %llud MB/s\n",
+	print("%d writes of %d in %llu cycles @ %dMHz = %llu MB/s\n",
 		count, length, stop - start, mhz, r);
 
 	exits(0);

+ 1 - 1
sys/src/9/root/suck.c

@@ -288,7 +288,7 @@ main(int argc, char* argv[])
 	r *= mhz;
 	r /= stop - start;
 
-	print("%d reads in %llud cycles @ %dMHz = %llud MB/s\n",
+	print("%d reads in %llu cycles @ %dMHz = %llu MB/s\n",
 		i, stop - start, mhz, r);
 
 	exits(0);

+ 1 - 1
sys/src/cmd/acid/builtin.c

@@ -1028,7 +1028,7 @@ patom(uint8_t type, Store *res)
 		Bprint(bout, "%lu", (uint32_t)res->ival);
 		break;
 	case 'Z':
-		Bprint(bout, "%llud", res->ival);
+		Bprint(bout, "%llu", res->ival);
 		break;
 	case 'V':
 		Bprint(bout, "%lld", res->ival);

+ 2 - 2
sys/src/cmd/aquarela/smbcomlocking.c

@@ -97,7 +97,7 @@ smbcomlockingandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 			pr = SmbProcessResultFormat;
 			goto done;
 		}
-		smblogprint(h->command, "smbcomlockingandx: unlock pid 0x%.4x offset %llud length %llud\n",
+		smblogprint(h->command, "smbcomlockingandx: unlock pid 0x%.4x offset %llu length %llu\n",
 			pid, offset, length);
 		smbsharedfileunlock(f->sf, s, h->pid, offset, offset + length);
 	}
@@ -109,7 +109,7 @@ smbcomlockingandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 			pr = SmbProcessResultFormat;
 			goto done;
 		}
-		smblogprint(h->command, "smbcomlockingandx: lock pid 0x%.4x offset %llud length %llud\n",
+		smblogprint(h->command, "smbcomlockingandx: lock pid 0x%.4x offset %llu length %llu\n",
 			pid, offset, length);
 		if (!smbsharedfilelock(f->sf, s, h->pid, offset, offset + length))
 			break;

+ 1 - 1
sys/src/cmd/aquarela/smbcomopen.c

@@ -586,7 +586,7 @@ smbcomntcreateandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	smblogprint(h->command, "desiredaccess 0x%.8lux", desiredaccess);
 	smbsblutlogprint(h->command, dasblut, desiredaccess);
 	smblogprint(h->command, "\n");
-	smblogprint(h->command, "allocationsize %llud\n", allocationsize);
+	smblogprint(h->command, "allocationsize %llu\n", allocationsize);
 	smblogprint(h->command, "extfileattributes 0x%.8lux", extfileattributes);
 	smbsblutlogprint(h->command, efasblut, extfileattributes);
 	smblogprint(h->command, "\n");

+ 1 - 1
sys/src/cmd/aux/ms2.c

@@ -100,7 +100,7 @@ main(int argc, char **argv)
 	}
 
 	totsz = exech.txtsz + exech.datsz + exech.bsssz;
-	fprint(2, "%s: %lu+%lu+%lu=%llud\n",
+	fprint(2, "%s: %lu+%lu+%lu=%llu\n",
 		exech.name, exech.txtsz, exech.datsz, exech.bsssz, totsz);
 
 	if(dsegonly)

+ 1 - 1
sys/src/cmd/aux/timesync.c

@@ -767,7 +767,7 @@ settime(int64_t now, uint64_t hz, int64_t delta, int n)
 	uint8_t b[1+sizeof(int64_t)+sizeof(int32_t)], *p;
 
 	if(debug)
-		fprint(2, "settime(now=%lld, hz=%llud, delta=%lld, period=%d)\n",
+		fprint(2, "settime(now=%lld, hz=%llu, delta=%lld, period=%d)\n",
 			now, hz, delta, n);
 	if(impotent)
 		return;

+ 1 - 1
sys/src/cmd/cfs/cfs.c

@@ -582,7 +582,7 @@ rread(Mfile *mf)
 			if(n == 0){
 				/* end of file */
 				if(b->inode.length > off){
-					DPRINT(2, "file %llud.%ld, length %lld\n",
+					DPRINT(2, "file %llu.%ld, length %lld\n",
 						b->inode.qid.path,
 						b->inode.qid.vers, off);
 					b->inode.length = off;

+ 3 - 3
sys/src/cmd/cfs/inode.c

@@ -204,7 +204,7 @@ iget(Icache *ic, Qid qid)
 				/*
 				 *  our info is old, forget it
 				 */
-				DPRINT(2, "updating old file %llud.%lu\n",
+				DPRINT(2, "updating old file %llu.%lu\n",
 					qid.path, qid.vers);
 				m->qid = qid;
 				iupdate(ic, m - ic->map, qid);
@@ -224,7 +224,7 @@ iget(Icache *ic, Qid qid)
 	 */
 	m = (Imap*)ic->mlru.lnext;
 	if(m->inuse){
-		DPRINT(2, "superceding file %llud.%ld by %llud.%ld\n",
+		DPRINT(2, "superceding file %llu.%ld by %llu.%ld\n",
 			m->qid.path, m->qid.vers, qid.path, qid.vers);
 		if(iremove(ic, m - ic->map) < 0)
 			return 0;
@@ -235,7 +235,7 @@ iget(Icache *ic, Qid qid)
 	/*
 	 *  init inode and write to disk
 	 */
-	DPRINT(2, "new file %llud.%ld ino %ld\n",
+	DPRINT(2, "new file %llu.%ld ino %ld\n",
 		qid.path, qid.vers, m - ic->map);
 	b = ialloc(ic, m - ic->map);
 	b->inode.inuse = m->inuse = 1;

+ 2 - 2
sys/src/cmd/cifs/transnt.c

@@ -149,7 +149,7 @@ TNTquerysecurity(Session *s, Share *sp, int fh, char **usid, char **gsid)
 		fmtstrinit(f);
 		fmtprint(f, "S-%u", g8(p));	/* revision */
 		n = g8(p);			/* num auth */
-		fmtprint(f, "-%llud", gb48(p));	/* authority */
+		fmtprint(f, "-%llu", gb48(p));	/* authority */
 		for(i = 0; i < n; i++)
 			fmtprint(f, "-%u", gl32(p));	/* sub-authorities */
 		*usid = fmtstrflush(f);
@@ -160,7 +160,7 @@ TNTquerysecurity(Session *s, Share *sp, int fh, char **usid, char **gsid)
 		fmtstrinit(f);
 		fmtprint(f, "S-%u", g8(p));	/* revision */
 		n = g8(p);			/* num auth */
-		fmtprint(f, "-%llud", gb48(p));	/* authority */
+		fmtprint(f, "-%llu", gb48(p));	/* authority */
 		for(i = 0; i < n; i++)
 			fmtprint(f, "-%u", gl32(p));	/* sub-authorities */
 		*gsid = fmtstrflush(f);

+ 2 - 2
sys/src/cmd/cwfs/chk.c

@@ -237,9 +237,9 @@ cmd_check(int argc, char *argv[])
 	print("nbad   = %lld\n", (Wideoff)nbad);
 	print("nqbad  = %lld\n", (Wideoff)nqbad);
 	print("maxq   = %lld\n", (Wideoff)maxq);
-	print("base stack=%llud\n", (int64_t)startstack);
+	print("base stack=%llu\n", (int64_t)startstack);
 	/* high-water mark of stack usage */
-	print("high stack=%llud\n", (int64_t)lowstack);
+	print("high stack=%llu\n", (int64_t)lowstack);
 	print("deepest recursion=%d\n", maxdepth-1);	/* one-origin */
 	if(!cwflag)
 		missing();

+ 3 - 3
sys/src/cmd/cwfs/iobuf.c

@@ -218,14 +218,14 @@ checktag(Iobuf *p, int tag, Off qpath)
 	t = (Tag*)(p->iobuf+BUFSIZE);
 	if(t->tag != tag) {
 		if(p->flags & Bmod) {
-			print("\ttag = %d/%llud; expected %lld/%d -- not flushed\n",
+			print("\ttag = %d/%llu; expected %lld/%d -- not flushed\n",
 				t->tag, (Wideoff)t->path, (Wideoff)qpath, tag);
 			return 2;
 		}
 		if(p->dev != nil && p->dev->type == Devcw)
 			cwfree(p->dev, p->addr);
 		if(p->addr != lastaddr)
-			print("\ttag = %G/%llud; expected %G/%lld -- flushed (%lld)\n",
+			print("\ttag = %G/%llu; expected %G/%lld -- flushed (%lld)\n",
 				t->tag, (Wideoff)t->path, tag, (Wideoff)qpath,
 				(Wideoff)p->addr);
 		lastaddr = p->addr;
@@ -237,7 +237,7 @@ checktag(Iobuf *p, int tag, Off qpath)
 	if(qpath != QPNONE) {
 		if((qpath ^ t->path) & ~QPDIR) {
 			if(1 || CHAT(0))
-				print("\ttag/path = %llud; expected %d/%llux\n",
+				print("\ttag/path = %llu; expected %d/%llux\n",
 					(Wideoff)t->path, tag, (Wideoff)qpath);
 			return 0;
 		}

+ 1 - 1
sys/src/cmd/dd.c

@@ -392,7 +392,7 @@ number(int64_t big)
 
 	case '\0':
 		if(n > big) {
-			fprint(2, "dd: argument %llud out of range\n", n);
+			fprint(2, "dd: argument %llu out of range\n", n);
 			exits("range");
 		}
 		return n;

+ 5 - 5
sys/src/cmd/disk/9660/cdrdwr.c

@@ -408,14 +408,14 @@ Cputnl(Cdimg *cd, uint64_t val, int size)
 		sysfatal("bad size %d in Cputnl", size);
 	case 2:
 		if(val >= (1<<16))
-			sysfatal("value %llud too big for size %d in Cputnl",
+			sysfatal("value %llu too big for size %d in Cputnl",
 				val, size);
 		Cputc(cd, val);
 		Cputc(cd, val>>8);
 		break;
 	case 4:
 		if(val >= (1ULL<<32))
-			sysfatal("value %llud too big for size %d in Cputnl",
+			sysfatal("value %llu too big for size %d in Cputnl",
 				val, size);
 		Cputc(cd, val);
 		Cputc(cd, val>>8);
@@ -443,14 +443,14 @@ Cputnm(Cdimg *cd, uint64_t val, int size)
 		sysfatal("bad size %d in Cputnm", size);
 	case 2:
 		if(val >= (1<<16))
-			sysfatal("value %llud too big for size %d in Cputnl",
+			sysfatal("value %llu too big for size %d in Cputnl",
 				val, size);
 		Cputc(cd, val>>8);
 		Cputc(cd, val);
 		break;
 	case 4:
 		if(val >= (1ULL<<32))
-			sysfatal("value %llud too big for size %d in Cputnl",
+			sysfatal("value %llu too big for size %d in Cputnl",
 				val, size);
 		Cputc(cd, val>>24);
 		Cputc(cd, val>>16);
@@ -651,7 +651,7 @@ Cgetc(Cdimg *cd)
 
 	Cwflush(cd);
 	if((c = Bgetc(&cd->brd)) == Beof) {
-		fprint(2, "getc at %llud\n", Croffset(cd));
+		fprint(2, "getc at %llu\n", Croffset(cd));
 		assert(0);
 		//sysfatal("Bgetc: %r");
 	}

+ 1 - 1
sys/src/cmd/disk/9660/conform.c

@@ -145,6 +145,6 @@ wrconform(Cdimg *cd, int n, uint32_t *pblock, uint64_t *plength)
 	}
 	qsort(c->t, c->nt, sizeof(c->t[0]), badatomcmp);
 	*plength = Cwoffset(cd) - (int64_t)*pblock * Blocksize;
-	chat("write _conform.map at %lu+%llud\n", *pblock, *plength);
+	chat("write _conform.map at %lu+%llu\n", *pblock, *plength);
 	Cpadblock(cd);
 }

+ 1 - 1
sys/src/cmd/disk/9660/dump9660.c

@@ -397,7 +397,7 @@ Dofix:
 		if(cd->nulldump){
 			Cwseek(cd, (int64_t)cd->nulldump * Blocksize);
 			sprint(buf, "plan 9 dump cd\n");
-			sprint(buf+strlen(buf), "%s %lu %lu %lu %llud %lu %lu",
+			sprint(buf+strlen(buf), "%s %lu %lu %lu %llu %lu %lu",
 				dumpname, now, newnull, cblock, clength,
 				iroot.block, iroot.length);
 			if(cd->flags & CDjoliet)

+ 1 - 1
sys/src/cmd/disk/9660/sysuse.c

@@ -317,7 +317,7 @@ Cputsysuse(Cdimg *cd, Direc *d, int dot, int dowrite, int initlen)
 
 	if(dowrite) {
 		if(Cwoffset(cd) != o+co.len-initlen)
-			fprint(2, "offset %llud o+co.len-initlen %llud\n",
+			fprint(2, "offset %llu o+co.len-initlen %llu\n",
 				Cwoffset(cd), o+co.len-initlen);
 		assert(Cwoffset(cd) == o+co.len-initlen);
 	} else

+ 2 - 2
sys/src/cmd/disk/mkext.c

@@ -104,7 +104,7 @@ main(int argc, char **argv)
 			mkdirs(name, namep);
 		}
 		if(hflag){
-			Bprint(&bout, "%q %luo %q %q %lu %llud\n",
+			Bprint(&bout, "%q %luo %q %q %lu %llu\n",
 				name, mode, uid, gid, mtime, bytes);
 			if(bytes)
 				seekpast(bytes);
@@ -224,7 +224,7 @@ extract(char *name, uint32_t mode, uint32_t mtime, char *uid,
 	uint64_t tot;
 
 	if(vflag)
-		print("x %q %llud bytes\n", name, bytes);
+		print("x %q %llu bytes\n", name, bytes);
 
 	b = Bopen(name, OWRITE);
 	if(!b){

+ 1 - 1
sys/src/cmd/disk/prep/prep.c

@@ -425,7 +425,7 @@ autoxpart(Edit *edit)
 
 	for(i=0; i<nelem(autox); i++)
 		if(autox[i].alloc)
-			print("%s %llud\n", autox[i].name, autox[i].size);
+			print("%s %llu\n", autox[i].name, autox[i].size);
 
 	s = 0;
 	for(i=0; i<nelem(autox); i++){

+ 1 - 1
sys/src/cmd/du.c

@@ -38,7 +38,7 @@ int	sflag;
 int	tflag;
 int	uflag;
 
-char	*fmt = "%llud\t%q\n";
+char	*fmt = "%llu\t%q\n";
 char	*readbuf;
 int64_t	blocksize = Vkilo;	/* actually more likely to be 4K or 8K */
 int64_t	unit;			/* scale factor for output */

+ 4 - 4
sys/src/cmd/ecp.c

@@ -140,11 +140,11 @@ sectid(File *fp, Daddr sect)
 	static char sectname[256];
 
 	if (fp->startsect == 0)
-		snprint(sectname, sizeof sectname, "%s sector %llud",
+		snprint(sectname, sizeof sectname, "%s sector %llu",
 			fp->name, sect);
 	else
 		snprint(sectname, sizeof sectname,
-			"%s sector %llud (relative %llud)",
+			"%s sector %llu (relative %llu)",
 			fp->name, sect + fp->startsect, sect);
 	return sectname;
 }
@@ -487,7 +487,7 @@ copysects(File *src, File *dest, Daddr stsect, Daddr nsects, int mustseek)
 	/* give a few reassurances at the start, then every 10MB */
 	if (progress &&
 	    (stsect < blksects*10 || stsect%(10*1024*1024/sectsz) == 0))
-		fprint(2, "%s: copied%s to relative sector %llud\n", argv0,
+		fprint(2, "%s: copied%s to relative sector %llu\n", argv0,
 			(swizzle? " swizzled": ""), stsect + xfrsects - 1);
 	return 0;
 }
@@ -564,7 +564,7 @@ copyfile(File *src, File *dest, Daddr nsects, int plsverify)
 		if (vererrs <= 0)
 			fprint(2, "%s: no", argv0);
 		else
-			fprint(2, "%s: %llud", argv0, vererrs);
+			fprint(2, "%s: %llu", argv0, vererrs);
 		fprint(2, " error%s during verification\n",
 			(vererrs != 1? "s": ""));
 	}

+ 1 - 1
sys/src/cmd/fossil/9fsys.c

@@ -1177,7 +1177,7 @@ fsysPrintStat(char *prefix, char *file, DirEntry *de)
 
 	if(prefix == nil)
 		prefix = "";
-	consPrint("%sstat %q %q %q %q %s %llud\n", prefix,
+	consPrint("%sstat %q %q %q %q %s %llu\n", prefix,
 		file, de->elem, de->uid, de->gid, fsysModeString(de->mode, buf), de->size);
 }
 

+ 1 - 1
sys/src/cmd/fossil/source.c

@@ -69,7 +69,7 @@ sourceAlloc(Fs *fs, Block *b, Source *p, uint32_t offset, int mode,
 
 	if(e.depth < sizeToDepth(e.size, e.psize, e.dsize)){
 		pname = sourceName(p);
-		consPrint("%s: %s %V: sourceAlloc: depth %u size %llud "
+		consPrint("%s: %s %V: sourceAlloc: depth %u size %llu "
 			"psize %u dsize %u\n", fs->name, pname,
 			e.score, e.depth, e.size, e.psize, e.dsize);
 		goto Bad;

+ 1 - 1
sys/src/cmd/fossil/srcload.c

@@ -220,7 +220,7 @@ dump(Source *s, int ident, uint32_t entry)
 	Bprint(bout, "%4lud: gen %4ud depth %d tag=%x score=%V",
 		entry, e.gen, e.depth, e.tag, e.score);
 	if(!s->dir){
-		Bprint(bout, " data size: %llud\n", e.size);
+		Bprint(bout, " data size: %llu\n", e.size);
 		return;
 	}
 	n = sourceGetDirSize(s);

+ 1 - 1
sys/src/cmd/fossil/view.c

@@ -724,7 +724,7 @@ initxdirentry(MetaEntry *me)
 	if(!deUnpack(&dir, me))
 		return stringnode("deUnpack: %R");
 
-	t = stringnode("dirEntry elem=%s size=%llud data=%#lux/%#lux meta=%#lux/%#lux", dir.elem, dir.size, dir.entry, dir.gen, dir.mentry, dir.mgen);
+	t = stringnode("dirEntry elem=%s size=%llu data=%#lux/%#lux meta=%#lux/%#lux", dir.elem, dir.size, dir.entry, dir.gen, dir.mentry, dir.mgen);
 	t->nkid = 1;
 	t->kid = mallocz(sizeof(t->kid[0])*1, 1);
 	t->kid[0] = stringnode(

+ 1 - 1
sys/src/cmd/ip/dhcpd/dhcpd.c

@@ -212,7 +212,7 @@ timestamp(char *tag)
 	uint64_t t;
 
 	t = nsec()/1000;
-	syslog(0, blog, "%s %lludµs", tag, t - start);
+	syslog(0, blog, "%s %lluµs", tag, t - start);
 }
 
 void

+ 2 - 2
sys/src/cmd/ls.c

@@ -174,7 +174,7 @@ dowidths(Dir *db)
 	int n;
 
 	if(sflag) {
-		n = sprint(buf, "%llud", (db->length+1023)/1024);
+		n = sprint(buf, "%llu", (db->length+1023)/1024);
 		if(n > swidth)
 			swidth = n;
 	}
@@ -198,7 +198,7 @@ dowidths(Dir *db)
 		n = sprint(buf, "%q", db->gid);
 		if(n > gwidth)
 			gwidth = n;
-		n = sprint(buf, "%llud", db->length);
+		n = sprint(buf, "%llu", db->length);
 		if(n > lwidth)
 			lwidth = n;
 	}

+ 1 - 1
sys/src/cmd/ratfs/main.c

@@ -248,7 +248,7 @@ printnode(Node *np)
 	if(np->d.qid.type&QTDIR)
 		fprint(debugfd, " QTDIR");
 	fprint(debugfd, "\n");
-	fprint(debugfd,"\tQID: %llud.%lu Mode: %lo Type: %d\n", np->d.qid.path,
+	fprint(debugfd,"\tQID: %llu.%lu Mode: %lo Type: %d\n", np->d.qid.path,
 			np->d.qid.vers, np->d.mode, np->d.type);
 	fprint(debugfd, "\tMod: %.15s  Acc: %.15s Count: %d\n", ctime(np->d.mtime)+4,
 			ctime(np->d.atime)+4, np->count);

+ 1 - 1
sys/src/cmd/stats.c

@@ -435,7 +435,7 @@ update1(Graph *g, uint64_t v, uint64_t vmax)
 	if(overflow && g->overtmp!=nil){
 		g->overflow = 1;
 		draw(g->overtmp, g->overtmp->r, screen, nil, g->overtmp->r.min);
-		sprint(buf, "%llud", v);
+		sprint(buf, "%llu", v);
 		string(screen, g->overtmp->r.min, display->black, ZP, mediumfont, buf);
 	}
 }

+ 1 - 1
sys/src/cmd/tarsplit/tarsub.c

@@ -80,7 +80,7 @@ writetar(int outf, char *buffer, uint32_t size)
 {
 	if (write(outf, buffer, size) < size) {
 		fprint(2, "%s: archive write error: %r\n", argv0);
-		fprint(2, "%s: archive seek offset: %llud\n", argv0, outoff);
+		fprint(2, "%s: archive seek offset: %llu\n", argv0, outoff);
 		exits("write");
 	}
 	outoff += size;

+ 1 - 1
sys/src/cmd/venti/srv/arenas.c

@@ -433,7 +433,7 @@ outputamap(Fmt *f, AMap *am, int n)
 	if(fmtprint(f, "%u\n", n) < 0)
 		return -1;
 	for(i = 0; i < n; i++)
-		if(fmtprint(f, "%s\t%llud\t%llud\n", am[i].name, am[i].start, am[i].stop) < 0)
+		if(fmtprint(f, "%s\t%llu\t%llu\n", am[i].name, am[i].start, am[i].stop) < 0)
 			return -1;
 	return 0;
 }

+ 1 - 1
sys/src/cmd/venti/srv/buildbuck.c

@@ -70,7 +70,7 @@ peekientry(IEStream *ies)
 		nn -= n;
 		if(nn == 0)
 			return nil;
-//fprint(2, "peek %d from %llud into %p\n", nn, ies->off, ies->epos);
+//fprint(2, "peek %d from %llu into %p\n", nn, ies->off, ies->epos);
 		if(readpart(ies->part, ies->off, ies->epos, nn) < 0){
 			seterr(EOk, "can't read sorted index entries: %r");
 			return nil;

+ 8 - 8
sys/src/cmd/venti/srv/clump.c

@@ -143,7 +143,7 @@ loadclump(Arena *arena, uint64_t aa, int blocks, Clump *cl, uint8_t *score,
 	}
 	trace(TraceLump, "loadclump unpack");
 	if(unpackclump(cl, cb->data, arena->clumpmagic) < 0){
-		seterr(ECorrupt, "loadclump %s %llud: %r", arena->name, aa);
+		seterr(ECorrupt, "loadclump %s %llu: %r", arena->name, aa);
 		freezblock(cb);
 		return nil;
 	}
@@ -182,9 +182,9 @@ loadclump(Arena *arena, uint64_t aa, int blocks, Clump *cl, uint8_t *score,
 		nunc = unwhack(&uw, zb->data, cl->info.uncsize, buf, cl->info.size);
 		if(nunc != cl->info.uncsize){
 			if(nunc < 0)
-				seterr(ECorrupt, "decompression of %llud failed: %s", aa, uw.err);
+				seterr(ECorrupt, "decompression of %llu failed: %s", aa, uw.err);
 			else
-				seterr(ECorrupt, "decompression of %llud gave partial block: %d/%d\n", aa, nunc, cl->info.uncsize);
+				seterr(ECorrupt, "decompression of %llu gave partial block: %d/%d\n", aa, nunc, cl->info.uncsize);
 			freezblock(cb);
 			freezblock(zb);
 			return nil;
@@ -192,18 +192,18 @@ loadclump(Arena *arena, uint64_t aa, int blocks, Clump *cl, uint8_t *score,
 		break;
 	case ClumpENone:
 		if(cl->info.size != cl->info.uncsize){
-			seterr(ECorrupt, "loading clump: bad uncompressed size for uncompressed block %llud", aa);
+			seterr(ECorrupt, "loading clump: bad uncompressed size for uncompressed block %llu", aa);
 			freezblock(cb);
 			freezblock(zb);
 			return nil;
 		}
 		scoremem(bh, buf, cl->info.uncsize);
 		if(scorecmp(cl->info.score, bh) != 0)
-			seterr(ECorrupt, "pre-copy sha1 wrong at %s %llud: expected=%V got=%V", arena->name, aa, cl->info.score, bh);
+			seterr(ECorrupt, "pre-copy sha1 wrong at %s %llu: expected=%V got=%V", arena->name, aa, cl->info.score, bh);
 		memmove(zb->data, buf, cl->info.uncsize);
 		break;
 	default:
-		seterr(ECorrupt, "unknown encoding in loadlump %llud", aa);
+		seterr(ECorrupt, "unknown encoding in loadlump %llu", aa);
 		freezblock(cb);
 		freezblock(zb);
 		return nil;
@@ -214,12 +214,12 @@ loadclump(Arena *arena, uint64_t aa, int blocks, Clump *cl, uint8_t *score,
 		trace(TraceLump, "loadclump verify");
 		scoremem(bh, zb->data, cl->info.uncsize);
 		if(scorecmp(cl->info.score, bh) != 0){
-			seterr(ECorrupt, "loading clump: corrupted at %s %llud; expected=%V got=%V", arena->name, aa, cl->info.score, bh);
+			seterr(ECorrupt, "loading clump: corrupted at %s %llu; expected=%V got=%V", arena->name, aa, cl->info.score, bh);
 			freezblock(zb);
 			return nil;
 		}
 		if(vttypevalid(cl->info.type) < 0){
-			seterr(ECorrupt, "loading lump at %s %llud: invalid lump type %d", arena->name, aa, cl->info.type);
+			seterr(ECorrupt, "loading lump at %s %llu: invalid lump type %d", arena->name, aa, cl->info.type);
 			freezblock(zb);
 			return nil;
 		}

+ 1 - 1
sys/src/cmd/venti/srv/httpd.c

@@ -1132,7 +1132,7 @@ xmlu32int(Hio *hout, uint32_t v, char *tag)
 void
 xmlu64int(Hio *hout, uint64_t v, char *tag)
 {
-	hprint(hout, " %s=\"%llud\"", tag, v);
+	hprint(hout, " %s=\"%llu\"", tag, v);
 }
 
 void

+ 1 - 1
sys/src/cmd/venti/srv/icachewrite.c

@@ -108,7 +108,7 @@ icachewritesect(Index *ix, ISect *is, uint8_t *buf)
 	else
 		hi = is->stop * ix->div - 1;
 
-	trace(TraceProc, "icachewritesect enter %u %u %llud",
+	trace(TraceProc, "icachewritesect enter %u %u %llu",
 		lo, hi, iwrite.as.aa);
 
 	iedirty = icachedirty(lo, hi, iwrite.as.aa);

+ 7 - 7
sys/src/cmd/venti/srv/printarena.c

@@ -33,7 +33,7 @@ rdarena(Arena *arena, uint64_t offset)
 	e = arena->base + arena->size;
 	if(offset != ~(uint64_t)0) {
 		if(offset >= e-a)
-			sysfatal("bad offset %llud >= %llud",
+			sysfatal("bad offset %llu >= %llu",
 				offset, e-a);
 		aa = offset;
 	} else
@@ -44,30 +44,30 @@ rdarena(Arena *arena, uint64_t offset)
 		if(magic == ClumpFreeMagic)
 			break;
 		if(magic != arena->clumpmagic) {
-			fprint(2, "illegal clump magic number %#8.8ux offset %llud\n",
+			fprint(2, "illegal clump magic number %#8.8ux offset %llu\n",
 				magic, aa);
 			break;
 		}
 		lump = loadclump(arena, aa, 0, &cl, score, 0);
 		if(lump == nil) {
-			fprint(2, "clump %llud failed to read: %r\n", aa);
+			fprint(2, "clump %llu failed to read: %r\n", aa);
 			break;
 		}
 		if(cl.info.type != VtCorruptType) {
 			scoremem(score, lump->data, cl.info.uncsize);
 			if(scorecmp(cl.info.score, score) != 0) {
-				fprint(2, "clump %llud has mismatched score\n", aa);
+				fprint(2, "clump %llu has mismatched score\n", aa);
 				break;
 			}
 			if(vttypevalid(cl.info.type) < 0) {
-				fprint(2, "clump %llud has bad type %d\n", aa, cl.info.type);
+				fprint(2, "clump %llu has bad type %d\n", aa, cl.info.type);
 				break;
 			}
 		}
 		print("%22llud %V %3d %5d\n", aa, score, cl.info.type, cl.info.uncsize);
 		freezblock(lump);
 	}
-	print("end offset %llud\n", aa);
+	print("end offset %llu\n", aa);
 }
 
 void
@@ -120,7 +120,7 @@ threadmain(int argc, char *argv[])
 		head.size, head.clumpmagic);
 
 	if(aoffset+head.size > part->size)
-		sysfatal("arena is truncated: want %llud bytes have %llud",
+		sysfatal("arena is truncated: want %llu bytes have %llu",
 			head.size, part->size);
 
 	partblocksize(part, head.blocksize);

+ 2 - 2
sys/src/cmd/venti/srv/wrarena.c

@@ -47,7 +47,7 @@ vtsendthread(void *v)
 		if(zcl.lump == nil)
 			break;
 		if(vtwrite(z, zcl.cl.info.score, zcl.cl.info.type, zcl.lump->data, zcl.cl.info.uncsize) < 0)
-			sysfatal("failed writing clump %llud: %r", zcl.aa);
+			sysfatal("failed writing clump %llu: %r", zcl.aa);
 		if(verbose)
 			print("%V\n", zcl.cl.info.score);
 		freezblock(zcl.lump);
@@ -197,7 +197,7 @@ threadmain(int argc, char *argv[])
 		sysfatal("corrupted arena header: %r");
 
 	if(aoffset+head.size > part->size)
-		sysfatal("arena is truncated: want %llud bytes have %llud",
+		sysfatal("arena is truncated: want %llu bytes have %llu",
 			head.size, part->size);
 
 	partblocksize(part, head.blocksize);

+ 1 - 1
sys/src/libmp/test.c

@@ -393,7 +393,7 @@ testgcd(void)
 	mpfree(t2);
 
 	if(loops > 1)
-		print("binary %llud\n", etime);
+		print("binary %llu\n", etime);
 }
 
 extern int _unnormalizedwarning = 1;

+ 2 - 2
sys/src/libusb/disk/disk.c

@@ -155,7 +155,7 @@ umscapacity(Umsc *lun)
 	lun->blocks++; /* SRcapacity returns LBA of last block */
 	lun->capacity = (int64_t)lun->blocks * lun->ScsiReq.lbsize;
 	if(diskdebug)
-		fprint(2, "disk: logical block size %lu, # blocks %llud\n",
+		fprint(2, "disk: logical block size %lu, # blocks %llu\n",
 			lun->ScsiReq.lbsize, lun->blocks);
 	return 0;
 }
@@ -496,7 +496,7 @@ dread(Usbfs *fs, Fid *fid, void *data, int32_t count, int64_t offset)
 			s = seprint(s, e, "inquiry %s lun %ld: %s\n",
 				fs->dev->dir, lun - &ums->lun[0], lun->inq);
 		if(lun->blocks > 0)
-			s = seprint(s, e, "geometry %llud %ld\n",
+			s = seprint(s, e, "geometry %llu %ld\n",
 				lun->blocks, lun->ScsiReq.lbsize);
 		count = usbreadbuf(data, count, offset, buf, s - buf);
 		break;

+ 2 - 2
sys/src/libusb/disk/scsireq.c

@@ -834,7 +834,7 @@ dirdevopen(ScsiReq *rp)
 	blocks =     GETBELONG(data);
 	if(debug)
 		fprint(2, "disk: dirdevopen: 10-byte logical block size %lu, "
-			"# blocks %llud\n", rp->lbsize, blocks);
+			"# blocks %llu\n", rp->lbsize, blocks);
 	if(blocks == 0xffffffff){
 		if(SRrcapacity16(rp, data) == -1)
 			return -1;
@@ -842,7 +842,7 @@ dirdevopen(ScsiReq *rp)
 		blocks = (int64_t)GETBELONG(data)<<32 | GETBELONG(data + 4);
 		if(debug)
 			fprint(2, "disk: dirdevopen: 16-byte logical block size"
-				" %lu, # blocks %llud\n", rp->lbsize, blocks);
+				" %lu, # blocks %llu\n", rp->lbsize, blocks);
 	}
 	/* some newer dev's don't support 6-byte commands */
 	if(blocks > Max24off && !force6bytecmds)

+ 1 - 1
sys/src/libventi/file.c

@@ -77,7 +77,7 @@ vtfilealloc(VtCache *c, VtBlock *b, VtFile *p, uint32_t offset, int mode)
 	}
 
 	if(DEPTH(e.type) < sizetodepth(e.size, e.psize, e.dsize)){
-		fprint(2, "depth %u size %llud psize %u dsize %u\n",
+		fprint(2, "depth %u size %llu psize %u dsize %u\n",
 			DEPTH(e.type), e.size, e.psize, e.dsize);
 		werrstr("bad depth");
 		return nil;