fixfmt: finnishing src/cmd cleaning

sys/src/cmd/aux/gps/gpsfs.c

@@ -495,7 +495,7 @@ readtime(Req *r)
 	lock(&fixlock);
 	memmove(&f, &curfix, sizeof f);
 	unlock(&fixlock);
-	seprint(buf, buf + sizeof buf, "%*.0lud %*.0llud %*.0llud %c",
+	seprint(buf, buf + sizeof buf, "%*.0lu %*.0llu %*.0llu %c",
 		Numsize-1, f.time,
 		Vlnumsize-1, f.gpstime,
 		Vlnumsize-1, f.localtime, f.valid + (gpsplayback?1:0));

sys/src/cmd/aux/vga/ics534x.c

@@ -252,7 +252,7 @@ dump(Vga* vga, Ctlr* ctlr)
 		f = 14318180*(m+2);
 		f /= (n & 0x1F)+2;
 		f /= 1<<((n>>5) & 0x03);
-		Bprint(&stdout, "%12lud", f);
+		Bprint(&stdout, "%12lu", f);
 	}
 	printitem(ctlr->name, "control");
 	printreg(inportb(Pdata));

sys/src/cmd/aux/vga/rgb524mn.c

@@ -248,7 +248,7 @@ dumpclock(Vga* vga, Ctlr* ctlr, uint32_t fref, uint32_t m, uint32_t n,
 		break;
 	}
 	printitem(ctlr->name, name);
-	Bprint(&stdout, "%12lud\n", f);
+	Bprint(&stdout, "%12lu\n", f);
 }
 
 static void

sys/src/cmd/cdfs/mmc.c

@@ -1213,7 +1213,7 @@ alltrackinfo(Drive *drive, int first, int last)
 		else
 			drive->laysfx = "";		/* 25GB nominal */
 		if (vflag)
-			fprint(2, "capacity %,lud sectors (%,lld bytes); bd%s\n",
+			fprint(2, "capacity %,lu sectors (%,lld bytes); bd%s\n",
 				track->end, cap, drive->laysfx);
 		if (osfx == nil || strcmp(osfx, drive->laysfx) != 0)
 			drive->relearn = 1;

sys/src/cmd/cfs/cfs.c

@@ -859,7 +859,7 @@ genstats(void)
 	for (i = 0; i < nelem(cfsstat.cm); i++)
 		if(cfsstat.cm[i].n || cfsstat.sm[i].n) {
 			p += snprint(p, sizeof statbuf+statbuf-p,
-				"%7lud %7lud ", cfsstat.cm[i].n,
+				"%7lu %7lu ", cfsstat.cm[i].n,
 				cfsstat.cm[i].n - cfsprev.cm[i].n);
 			if (cfsstat.cm[i].n)
 				p += snprint(p, sizeof statbuf+statbuf-p,
@@ -877,7 +877,7 @@ genstats(void)
 				p += snprint(p, sizeof statbuf+statbuf-p,
 					"        ");
 			p += snprint(p, sizeof statbuf+statbuf-p,
-				"%7lud %7lud ", cfsstat.sm[i].n,
+				"%7lu %7lu ", cfsstat.sm[i].n,
 				cfsstat.sm[i].n - cfsprev.sm[i].n);
 			if (cfsstat.sm[i].n)
 				p += snprint(p, sizeof statbuf+statbuf-p,
@@ -897,33 +897,33 @@ genstats(void)
 			p += snprint(p, sizeof statbuf+statbuf-p, "%s\n",
 				mname[i]);
 		}
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ndirread\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lu %7lu ndirread\n",
 		cfsstat.ndirread, cfsstat.ndirread - cfsprev.ndirread);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ndelegateread\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lu %7lu ndelegateread\n",
 		cfsstat.ndelegateread, cfsstat.ndelegateread -
 		cfsprev.ndelegateread);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ninsert\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lu %7lu ninsert\n",
 		cfsstat.ninsert, cfsstat.ninsert - cfsprev.ninsert);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ndelete\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lu %7lu ndelete\n",
 		cfsstat.ndelete, cfsstat.ndelete - cfsprev.ndelete);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud nupdate\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lu %7lu nupdate\n",
 		cfsstat.nupdate, cfsstat.nupdate - cfsprev.nupdate);
 
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesread\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llu %7llu bytesread\n",
 		cfsstat.bytesread, cfsstat.bytesread - cfsprev.bytesread);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud byteswritten\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llu %7llu byteswritten\n",
 		cfsstat.byteswritten, cfsstat.byteswritten -
 		cfsprev.byteswritten);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesfromserver\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llu %7llu bytesfromserver\n",
 		cfsstat.bytesfromserver, cfsstat.bytesfromserver -
 		cfsprev.bytesfromserver);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesfromdirs\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llu %7llu bytesfromdirs\n",
 		cfsstat.bytesfromdirs, cfsstat.bytesfromdirs -
 		cfsprev.bytesfromdirs);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesfromcache\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llu %7llu bytesfromcache\n",
 		cfsstat.bytesfromcache, cfsstat.bytesfromcache -
 		cfsprev.bytesfromcache);
-	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytestocache\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llu %7llu bytestocache\n",
 		cfsstat.bytestocache, cfsstat.bytestocache -
 		cfsprev.bytestocache);
 	statlen = p - statbuf;

sys/src/cmd/colors.c

@@ -97,12 +97,12 @@ main(int argc, char *argv[])
 
 	ramp = 0;
 
-	fmt = "index %3d r %3lud g %3lud b %3lud 0x%.8luX        ";
+	fmt = "index %3d r %3lu g %3lu b %3lu 0x%.8lX        ";
 	ARGBEGIN{
 	default:
 		goto Usage;
 	case 'x':
-		fmt = "index %2luX r %3luX g %3luX b %3luX 0x%.8luX       ";
+		fmt = "index %2lX r %3lX g %3lX b %3lX 0x%.8lX       ";
 		break;
 	case 'r':
 		ramp = 1;

sys/src/cmd/cwfs/main.c

@@ -217,7 +217,7 @@ printsizes(void)
 
 		if (max >= offlim)
 			max = offlim - 1;
-		print("max file size = %,llud\n", (Wideoff)max);
+		print("max file size = %,llu\n", (Wideoff)max);
 	}
 	if (INDPERBUF⁲/INDPERBUF != INDPERBUF)
 		print("overflow computing INDPERBUF⁲\n");

sys/src/cmd/db/format.c

@@ -136,13 +136,13 @@ exform(int fcount, int prt, char *ifp, Map *map, int literal,
 			w = sh;
 			dotinc = 2;
 			if (c == 'u')
-				dprint("%-8lud", w);
+				dprint("%-8lu", w);
 			else if (c == 'x')
-				dprint("%-8#lux", w);
+				dprint("%-8#lx", w);
 			else if (c == 'd')
 				dprint("%-8ld", w);
 			else if (c == 'o')
-				dprint("%-8#luo", w);
+				dprint("%-8#lo", w);
 			else if (c == 'q')
 				dprint("%-8#lo", w);
 			break;
@@ -158,13 +158,13 @@ exform(int fcount, int prt, char *ifp, Map *map, int literal,
 				error("%r");
 			dotinc = 4;
 			if (c == 'U')
-				dprint("%-16lud", w);
+				dprint("%-16lu", w);
 			else if (c == 'X')
-				dprint("%-16#lux", w);
+				dprint("%-16#lx", w);
 			else if (c == 'D')
 				dprint("%-16ld", w);
 			else if (c == 'O')
-				dprint("%-#16luo", w);
+				dprint("%-#16lo", w);
 			else if (c == 'Q')
 				dprint("%-#16lo", w);
 			break;
@@ -177,11 +177,11 @@ exform(int fcount, int prt, char *ifp, Map *map, int literal,
 				error("%r");
 			dotinc = 8;
 			if (c == 'Y')
-				dprint("%-20#llux", v);
+				dprint("%-20#llx", v);
 			else if (c == 'V')
 				dprint("%-20lld", v);
 			else if (c == 'Z')
-				dprint("%-20llud", v);
+				dprint("%-20llu", v);
 			break;
 		case 'B':
 		case 'b':

sys/src/cmd/disk/kfs/sub.c

@@ -538,7 +538,7 @@ Afmt(Fmt *f1)
 	Filta a;
 
 	a = va_arg(f1->args, Filta);
-	return fmtprint(f1, "%6lud %6lud %6lud",
+	return fmtprint(f1, "%6lu %6lu %6lu",
 		fdf(a.f->filter[0], a.scale*60),
 		fdf(a.f->filter[1], a.scale*600),
 		fdf(a.f->filter[2], a.scale*6000));

sys/src/cmd/fossil/9fsys.c

@@ -648,7 +648,7 @@ fsysLabel(Fsys* fsys, int argc, char* argv[])
 		goto Out0;
 
 	l = b->l;
-	consPrint("%slabel %#ux %u %u %u %u %#x\n",
+	consPrint("%slabel %#x %u %u %u %u %#x\n",
 		argc==6 ? "old: " : "", addr, l.type, l.state,
 		l.epoch, l.epochClose, l.tag);
 
@@ -664,7 +664,7 @@ fsysLabel(Fsys* fsys, int argc, char* argv[])
 		if(strcmp(argv[5], "-") != 0)
 			l.tag = strtoul(argv[5], 0, 0);
 
-		consPrint("new: label %#ux %u %u %u %u %#x\n",
+		consPrint("new: label %#x %u %u %u %u %#x\n",
 			addr, l.type, l.state, l.epoch, l.epochClose, l.tag);
 		bb = _blockSetLabel(b, &l);
 		if(bb == nil)
@@ -735,12 +735,12 @@ fsysBlock(Fsys* fsys, int argc, char* argv[])
 
 	b = cacheLocal(fs->cache, PartData, addr, argc==4 ? OReadWrite : OReadOnly);
 	if(b == nil){
-		vtSetError("cacheLocal %#ux: %R", addr);
+		vtSetError("cacheLocal %#x: %R", addr);
 		vtRUnlock(fs->elk);
 		return 0;
 	}
 
-	consPrint("\t%sblock %#ux %u %u %.*H\n",
+	consPrint("\t%sblock %#x %u %u %.*H\n",
 		argc==4 ? "old: " : "", addr, offset, count, count, b->data+offset);
 
 	if(argc == 4){
@@ -767,7 +767,7 @@ fsysBlock(Fsys* fsys, int argc, char* argv[])
 			buf[i>>1] |= c;
 		}
 		memmove(b->data+offset, buf, count);
-		consPrint("\tnew: block %#ux %u %u %.*H\n",
+		consPrint("\tnew: block %#x %u %u %.*H\n",
 			addr, offset, count, count, b->data+offset);
 		blockDirty(b);
 	}
@@ -811,14 +811,14 @@ fsysBfree(Fsys* fsys, int argc, char* argv[])
 		}
 		b = cacheLocal(fs->cache, PartData, addr, OReadOnly);
 		if(b == nil){
-			consPrint("loading %#ux: %R\n", addr);
+			consPrint("loading %#x: %R\n", addr);
 			continue;
 		}
 		l = b->l;
 		if(l.state == BsFree)
-			consPrint("%#ux is already free\n", addr);
+			consPrint("%#x is already free\n", addr);
 		else{
-			consPrint("label %#ux %u %u %u %u %#x\n",
+			consPrint("label %#x %u %u %u %u %#x\n",
 				addr, l.type, l.state, l.epoch, l.epochClose, l.tag);
 			l.state = BsFree;
 			l.type = BtMax;
@@ -826,7 +826,7 @@ fsysBfree(Fsys* fsys, int argc, char* argv[])
 			l.epoch = 0;
 			l.epochClose = 0;
 			if(!blockSetLabel(b, &l, 0))
-				consPrint("freeing %#ux: %R\n", addr);
+				consPrint("freeing %#x: %R\n", addr);
 		}
 		blockPut(b);
 		argc--;
@@ -853,7 +853,7 @@ fsysDf(Fsys *fsys, int argc, char* argv[])
 
 	fs = fsys->fs;
 	cacheCountUsed(fs->cache, fs->elo, &used, &tot, &bsize);
-	consPrint("\t%s: %,llud used + %,llud free = %,llud (%.1f%% used)\n",
+	consPrint("\t%s: %,llu used + %,llu free = %,llu (%.1f%% used)\n",
 		fsys->name, used*(int64_t)bsize, (tot-used)*(int64_t)bsize,
 		tot*(int64_t)bsize, used*100.0/tot);
 	return 1;
@@ -886,7 +886,7 @@ fsysClrep(Fsys* fsys, int argc, char* argv[], int ch)
 	addr = strtoul(argv[0], 0, 0);
 	b = cacheLocal(fs->cache, PartData, addr, argc==4 ? OReadWrite : OReadOnly);
 	if(b == nil){
-		vtSetError("cacheLocal %#ux: %R", addr);
+		vtSetError("cacheLocal %#x: %R", addr);
 	Err:
 		vtRUnlock(fsys->fs->elk);
 		return 0;
@@ -922,7 +922,7 @@ fsysClrep(Fsys* fsys, int argc, char* argv[], int ch)
 			consPrint("\toffset %d too large (>= %d)\n", i, max);
 			continue;
 		}
-		consPrint("\tblock %#ux %d %d %.*H\n", addr, offset*sz, sz, sz, b->data+offset*sz);
+		consPrint("\tblock %#x %d %d %.*H\n", addr, offset*sz, sz, sz, b->data+offset*sz);
 		memmove(b->data+offset*sz, zero, sz);
 	}
 	blockDirty(b);
@@ -1331,7 +1331,7 @@ fsckClose(Fsck *fsck, Block *b, uint32_t epoch)
 		return;
 	l = b->l;
 	if(l.state == BsFree || (l.state&BsClosed)){
-		consPrint("%#ux is already closed\n", b->addr);
+		consPrint("%#x is already closed\n", b->addr);
 		return;
 	}
 	if(epoch){	
@@ -1341,7 +1341,7 @@ fsckClose(Fsck *fsck, Block *b, uint32_t epoch)
 		l.state = BsFree;
 		
 	if(!blockSetLabel(b, &l, 0))
-		consPrint("%#ux setlabel: %R\n", b->addr);
+		consPrint("%#x setlabel: %R\n", b->addr);
 }
 
 static void

sys/src/cmd/fossil/srcload.c

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

sys/src/cmd/freq.c

@@ -121,7 +121,7 @@ freq(int f, char *s)
 			else
 				Bprint(&bout, "%C ", (int)i);
 		}
-		Bprint(&bout, "%8llud\n", count[i]);
+		Bprint(&bout, "%8llu\n", count[i]);
 	}
 	Bflush(&bout);
 }

sys/src/cmd/gzip/unzip.c

@@ -175,7 +175,7 @@ unztable(Biobuf *bin, char *file)
 
 		if(wantFile(zh.file)){
 			if(verbose)
-				print("%-32s %10lud %s", zh.file, zh.uncsize, ctime(msdos2time(zh.modtime, zh.moddate)));
+				print("%-32s %10lu %s", zh.file, zh.uncsize, ctime(msdos2time(zh.modtime, zh.moddate)));
 			else
 				print("%s\n", zh.file);
 
@@ -249,7 +249,7 @@ sunztable(Biobuf *bin)
 
 		if(wantFile(zh.file)){
 			if(verbose)
-				print("%-32s %10lud %s", zh.file, zh.uncsize, ctime(msdos2time(zh.modtime, zh.moddate)));
+				print("%-32s %10lu %s", zh.file, zh.uncsize, ctime(msdos2time(zh.modtime, zh.moddate)));
 			else
 				print("%s\n", zh.file);
 

sys/src/cmd/iostats/iostats.c

@@ -226,7 +226,7 @@ main(int argc, char **argv)
 		rpc = &stats->rpc[n];
 		if(rpc->count == 0)
 			continue;
-		fprint(2, "%-10s %5lud %5llud %5llud %5llud %5llud ms %8lud %8lud bytes\n", 
+		fprint(2, "%-10s %5lu %5llu %5llu %5llu %5llu ms %8lu %8lu bytes\n", 
 			rpc->name, 
 			rpc->count,
 			rpc->lo/1000000,
@@ -260,7 +260,7 @@ main(int argc, char **argv)
 		else
 			s = "/.";
 
-		fprint(2, "%5lud %8lud %8lud %8lud %8lud %s\n", fr->opens, fr->nread, fr->bread,
+		fprint(2, "%5lu %8lu %8lu %8lu %8lu %s\n", fr->opens, fr->nread, fr->bread,
 							fr->nwrite, fr->bwrite, s);
 	}
 

sys/src/cmd/ls.c

@@ -222,7 +222,7 @@ format(Dir *db, char *name)
 	int i;
 
 	if(sflag)
-		Bprint(&bin, "%*llud ",
+		Bprint(&bin, "%*llu ",
 			swidth, (db->length+1023)/1024);
 	if(mflag){
 		Bprint(&bin, "[%q] ", db->muid);
@@ -230,7 +230,7 @@ format(Dir *db, char *name)
 			Bprint(&bin, " ");
 	}
 	if(qflag)
-		Bprint(&bin, "(%.16llux %*lud %.2x) ",
+		Bprint(&bin, "(%.16llx %*lu %.2x) ",
 			db->qid.path,
 			qwidth, db->qid.vers,
 			db->qid.type);
@@ -238,7 +238,7 @@ format(Dir *db, char *name)
 		Bprint(&bin, "%c ", (db->mode&DMTMP)? 't': '-');
 
 	if(lflag)
-		Bprint(&bin, "%M %C %*ud %*q %*q %*llud %s ",
+		Bprint(&bin, "%M %C %*u %*q %*q %*llu %s ",
 			db->mode, db->type,
 			vwidth, db->dev,
 			-uwidth, db->uid,

sys/src/cmd/mtime.c

@@ -34,7 +34,7 @@ main(int argc, char **argv)
 			fprint(2, "stat %s: %r\n", argv[i]);
 			errors = 1;
 		}else{
-			print("%11lud %s\n", d->mtime, argv[i]);
+			print("%11lu %s\n", d->mtime, argv[i]);
 			free(d);
 		}
 	}

sys/src/cmd/netstat.c

@@ -237,7 +237,7 @@ pipifc(void)
 
 	for(nip = ip; nip; nip = nip->next){
 		for(lifc = nip->lifc; lifc; lifc = lifc->next)
-			Bprint(&out, "%-12s %5d %-*I %5M %-*I %8lud %8lud %8lud %8lud\n",
+			Bprint(&out, "%-12s %5d %-*I %5M %-*I %8lu %8lu %8lu %8lu\n",
 				nip->dev, nip->mtu, 
 				l, lifc->ip, lifc->mask, l, lifc->net,
 				nip->pktin, nip->pktout,

sys/src/cmd/ps.c

@@ -107,16 +107,16 @@ ps(char *s)
 
 	if(rflag){
 		if(rtime >= 86400)
-			sprint(rbuf, " %lu:%02lud:%02lud:%02lud", rtime/86400, (rtime/3600)%24, (rtime/60)%60, rtime%60);
+			sprint(rbuf, " %lu:%02lu:%02lu:%02lu", rtime/86400, (rtime/3600)%24, (rtime/60)%60, rtime%60);
 		else if(rtime >= 3600)
-			sprint(rbuf, " %lu:%02lud:%02lud", rtime/3600, (rtime/60)%60, rtime%60);
+			sprint(rbuf, " %lu:%02lu:%02lu", rtime/3600, (rtime/60)%60, rtime%60);
 		else
-			sprint(rbuf, " %lu:%02lud", rtime/60, rtime%60);
+			sprint(rbuf, " %lu:%02lu", rtime/60, rtime%60);
 		sprint(rbuf1, "%12s", rbuf);
 	}else
 		rbuf1[0] = 0;
 
-	Bprint(&bout, "%-10s %8s%s %4lud:%.2lud %3lud:%.2lud %s %7ludK %-8.8s ",
+	Bprint(&bout, "%-10s %8s%s %4lu:%.2lu %3lu:%.2lu %s %7luK %-8.8s ",
 			argv[1],
 			s,
 			rbuf1,

sys/src/cmd/snap/write.c

@@ -32,7 +32,7 @@ writeseg(Biobuf *b, Proc *proc, Seg *s)
 	int type;
 
 	if(s == nil){
-		Bprint(b, "%-11ud %-11ud ", 0, 0);
+		Bprint(b, "%-11u %-11u ", 0, 0);
 		return;
 	}
 
@@ -41,7 +41,7 @@ writeseg(Biobuf *b, Proc *proc, Seg *s)
 	if(npg != s->npg)
 		abort();
 
-	Bprint(b, "%-11llud %-11llud ", s->offset, s->len);
+	Bprint(b, "%-11llu %-11llu ", s->offset, s->len);
 	if(s->len == 0)
 		return;
 
@@ -51,7 +51,7 @@ writeseg(Biobuf *b, Proc *proc, Seg *s)
 				Bprint(b, "z");
 				continue;
 			}
-			Bprint(b, "%c%-11ld %-11llud ", p->type, p->pid, p->offset);
+			Bprint(b, "%c%-11ld %-11llu ", p->type, p->pid, p->offset);
 		} else {
 			Bprint(b, "r");
 			Bwrite(b, p->data, p->len);
@@ -74,7 +74,7 @@ writesnap(Biobuf *b, Proc *p)
 
 	for(i=0; i<Npfile; i++)
 		if(d = p->d[i]) {
-			Bprint(b, "%-11ld %s\n%-11lud ", p->pid, pfile[i], d->len);
+			Bprint(b, "%-11ld %s\n%-11lu ", p->pid, pfile[i], d->len);
 			Bwrite(b, d->data, d->len);
 		}
 

sys/src/cmd/sum.c

@@ -96,7 +96,7 @@ sum5(uint32_t sum, void *buf, uint64_t uvn)
 
 	if(buf == 0){
 		sum = ((sum>>16)+sum) & 0xFFFF;
-		print("%.5lud%6lld", sum, (uvn+(VBSIZE-1))/VBSIZE);
+		print("%.5lu%6lld", sum, (uvn+(VBSIZE-1))/VBSIZE);
 		return 0;
 	}
 	n = uvn;
@@ -115,7 +115,7 @@ sumr(uint32_t sum, void *buf, uint64_t uvn)
 
 	if(buf == 0){
 		sum &= 0xFFFF;
-		print("%.5lud%6lld", sum, (uvn+(RBSIZE-1))/RBSIZE);
+		print("%.5lu%6lld", sum, (uvn+(RBSIZE-1))/RBSIZE);
 		return 0;
 	}
 	n = uvn;
@@ -145,7 +145,7 @@ sum32(uint32_t lcrc, void *buf, uint64_t uvn)
 		x[2] = (n>>8)^0xCC;
 		x[3] = (n)^0x55;
 		crc = sum32(lcrc, x, 4);
-		print("%.8lux %6lld", crc, uvn);
+		print("%.8lx %6lld", crc, uvn);
 		return 0;
 	}
 	while(n-- > 0)

sys/src/cmd/venti/srv/fixarenas.c

@@ -117,7 +117,7 @@ bad(char *msg, int64_t o, int len)
 	}
 	if(lb1 != o || (msg && lmsg && strcmp(msg, lmsg) != 0)){
 		if(lb0 != lb1)
-			print("%s %#llux+%#llux (%,lld+%,lld)\n",
+			print("%s %#llx+%#llx (%,lld+%,lld)\n",
 				lmsg, lb0, lb1-lb0, lb0, lb1-lb0);
 		lb0 = o;
 	}
@@ -226,12 +226,12 @@ sbupdate(Shabuf *sb, uint8_t *p, int64_t offset, int len)
 		sb->r0 = offset;
 
 	if(sb->offset < offset || sb->offset >= offset+len){
-		if(0) print("sbupdate %p %#llux+%d but offset=%#llux\n",
+		if(0) print("sbupdate %p %#llx+%d but offset=%#llx\n",
 			p, offset, len, sb->offset);
 		return;
 	}
 	x = sb->offset - offset;
-	if(0) print("sbupdate %p %#llux+%d skip %d\n",
+	if(0) print("sbupdate %p %#llx+%d skip %d\n",
 		sb, offset, len, x);
 	if(x){
 		p += x;
@@ -366,7 +366,7 @@ pageout(void)
 		return;
 	}
 	if(writepart(part, bufoffset, buf, buflen) < 0)
-		print("disk write failed at %#llux+%#ux (%,lld+%,d)\n",
+		print("disk write failed at %#llx+%#x (%,lld+%,d)\n",
 			bufoffset, buflen, bufoffset, buflen);
 	buflen = 0;
 }
@@ -605,11 +605,11 @@ showdiffs(uint8_t *want, uint8_t *have, int len, Info *info)
 					info->name, *want, *have);
 				break;
 			case 4:
-				print("\t%s: correct=%#ux disk=%#ux\n",
+				print("\t%s: correct=%#x disk=%#x\n",
 					info->name, u32(want), u32(have));
 				break;
 			case D|4:
-				print("\t%s: correct=%,ud disk=%,ud\n",
+				print("\t%s: correct=%,u disk=%,u\n",
 					info->name, u32(want), u32(have));
 				break;
 			case T|4:
@@ -1394,7 +1394,7 @@ guessarena(int64_t offset0, int anum, ArenaHead *head, Arena *arena,
 				if(needtozero){
 					zerorange(lastclumpend, v);
 					sbrollback(&newsha, lastclumpend);
-					print("corrupt clump data - %#llux+%#llux (%,llud bytes)\n",
+					print("corrupt clump data - %#llx+%#llx (%,llu bytes)\n",
 						lastclumpend, v, v);
 				}
 				addcicorrupt(v);
@@ -1406,7 +1406,7 @@ guessarena(int64_t offset0, int anum, ArenaHead *head, Arena *arena,
 			}
 
 			if(haveclump(cl.info.score))
-				print("warning: duplicate clump %d %V at %#llux+%#d\n", cl.info.type, cl.info.score, offset, n);
+				print("warning: duplicate clump %d %V at %#llx+%#d\n", cl.info.type, cl.info.score, offset, n);
 
 			/*
 			 * If clumps use different magic numbers, we don't care.
@@ -1432,7 +1432,7 @@ guessarena(int64_t offset0, int anum, ArenaHead *head, Arena *arena,
 			 * grow clump info blocks if needed.
 			 */
 			if(verbose > 1)
-				print("\tclump %d: %d %V at %#llux+%#ux (%d)\n", 
+				print("\tclump %d: %d %V at %#llx+%#x (%d)\n", 
 					clumps, cl.info.type, cl.info.score, offset, n, n);
 			addcibuf(&cl.info, 0);
 			if(minclumps%ncib == 0)
@@ -1483,7 +1483,7 @@ guessarena(int64_t offset0, int anum, ArenaHead *head, Arena *arena,
 	arena->diskstats.used = lastclumpend - boffset;
 	leaked = eoffset - lastclumpend;
 	if(verbose)
-		print("used from %#llux to %#llux = %,lld (%,lld unused)\n",
+		print("used from %#llx to %#llx = %,lld (%,lld unused)\n",
 			boffset, lastclumpend, arena->diskstats.used, leaked);
 
 	/*
@@ -1696,7 +1696,7 @@ dumparena(int64_t offset, int anum, Arena *arena)
 		if(o+n > e)
 			n = e-o;
 		if(pwrite(fd, pagein(o, n), n, o-offset) != n){
-			fprint(2, "write %s at %#llux: %r\n", buf, o-offset);
+			fprint(2, "write %s at %#llx: %r\n", buf, o-offset);
 			return;
 		}
 	}
@@ -1712,7 +1712,7 @@ checkarena(int64_t offset, int anum)
 	Info *fmt, *fmta;
 	int sz;
 
-	print("# arena %d: offset %#llux\n", anum, offset);
+	print("# arena %d: offset %#llx\n", anum, offset);
 
 	if(offset >= partend){
 		print("arena offset out of bounds\n");
@@ -1725,7 +1725,7 @@ checkarena(int64_t offset, int anum)
 		print("#\tversion=%d name=%s blocksize=%d size=%z",
 			head.version, head.name, head.blocksize, head.size);
 		if(head.clumpmagic)
-			print(" clumpmagic=%#.8ux", head.clumpmagic);
+			print(" clumpmagic=%#.8x", head.clumpmagic);
 		print("\n#\tclumps=%d cclumps=%d used=%,lld uncsize=%,lld\n",
 			arena.diskstats.clumps, arena.diskstats.cclumps,
 			arena.diskstats.used, arena.diskstats.uncsize);

sys/src/cmd/venti/srv/printarena.c

@@ -44,7 +44,7 @@ rdarena(Arena *arena, uint64_t offset)
 		if(magic == ClumpFreeMagic)
 			break;
 		if(magic != arena->clumpmagic) {
-			fprint(2, "illegal clump magic number %#8.8ux offset %llu\n",
+			fprint(2, "illegal clump magic number %#8.8x offset %llu\n",
 				magic, aa);
 			break;
 		}
@@ -64,7 +64,7 @@ rdarena(Arena *arena, uint64_t offset)
 				break;
 			}
 		}
-		print("%22llud %V %3d %5d\n", aa, score, cl.info.type, cl.info.uncsize);
+		print("%22llu %V %3d %5d\n", aa, score, cl.info.type, cl.info.uncsize);
 		freezblock(lump);
 	}
 	print("end offset %llu\n", aa);

sys/src/cmd/vnc/devmouse.c

@@ -222,7 +222,7 @@ mouseread(Chan *c, void *va, int32_t n, int64_t off)
 		b = buttonmap[m.buttons&7];
 		/* put buttons 4 and 5 back in */
 		b |= m.buttons & (3<<3);
-		sprint(buf, "m%11d %11d %11d %11lud",
+		sprint(buf, "m%11d %11d %11d %11lu",
 			m.xy.x, m.xy.y,
 			b,
 			m.msec);

sys/src/cmd/wc.c

@@ -67,15 +67,15 @@ report(uint64_t nline, uint64_t nword, uint64_t nrune, uint64_t nbadr,
 	e = line + sizeof line;
 	line[0] = 0;
 	if(pline)
-		s = seprint(s, e, " %7llud", nline);
+		s = seprint(s, e, " %7llu", nline);
 	if(pword)
-		s = seprint(s, e, " %7llud", nword);
+		s = seprint(s, e, " %7llu", nword);
 	if(prune)
-		s = seprint(s, e, " %7llud", nrune);
+		s = seprint(s, e, " %7llu", nrune);
 	if(pbadr)
-		s = seprint(s, e, " %7llud", nbadr);
+		s = seprint(s, e, " %7llu", nbadr);
 	if(pchar)
-		s = seprint(s, e, " %7llud", nchar);
+		s = seprint(s, e, " %7llu", nchar);
 	if(fname != nil)
 		seprint(s, e, " %s",   fname);
 	print("%s\n", line+1);

sys/src/cmd/xd.c

@@ -54,8 +54,8 @@ fmtfn *fmt[4] = {
 char *dfmt[4][3] = {
 	" %.3o",	" %.3u",	" %.2x",
 	" %.6o",	" %.5u",	" %.4x",
-	" %.11luo",	" %.10lud",	" %.8lux",
-	" %.22lluo",	" %.20llud",	" %.16llux",
+	" %.11luo",	" %.10lu",	" %.8lx",
+	" %.22lluo",	" %.20llu",	" %.16llx",
 };
 
 char *cfmt[3][3] = {
@@ -69,8 +69,8 @@ char *rfmt[1][1] = {
 };
 
 char *afmt[2][3] = {
-	"%.7luo ",	"%.7lud ",	"%.7lux ",
-	"%7luo ",	"%7lud ",	"%7lux ",
+	"%.7luo ",	"%.7lu ",	"%.7lx ",
+	"%7luo ",	"%7lu ",	"%7lx ",
 };
 
 Biobuf	bin;