fixfmt: with this last round of changes I can boot.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

sys/man/3/arch

@@ -135,7 +135,7 @@ inportb(unsigned port)
 
     seek(iobfd, port, 0);
     if(read(iobfd, &data, sizeof(data)) != sizeof(data))
-        sysfatal("inportb(0x%4.4ux): %r", port);
+        sysfatal("inportb(0x%4.4x): %r", port);
     return data;
 }
 .EE

sys/src/9/386/devether.c

@@ -419,7 +419,7 @@ etherprobe(int cardno, int ctlrno)
 		i += sprint(buf+i, " addr %#p", ether->ISAConf.mem);
 	if(ether->ISAConf.size)
 		i += sprint(buf+i, " size 0x%lX", ether->ISAConf.size);
-	i += sprint(buf+i, ": %2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux",
+	i += sprint(buf+i, ": %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		ether->ea[0], ether->ea[1], ether->ea[2],
 		ether->ea[3], ether->ea[4], ether->ea[5]);
 	sprint(buf+i, "\n");

sys/src/9/386/ether8169.c

@@ -587,7 +587,7 @@ rtl8169ifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 			if(i && ((i & 0x07) == 0))
 				l += snprint(p+l, READSTR-l, "\n       ");
 			r = miimir(ctlr->mii, i);
-			l += snprint(p+l, READSTR-l, " %4.4ux", r);
+			l += snprint(p+l, READSTR-l, " %4.4x", r);
 		}
 		snprint(p+l, READSTR-l, "\n");
 	}
@@ -1177,7 +1177,7 @@ rtl8169pci(void)
 		if(vetmacv(ctlr, &macv) == -1){
 			iofree(port);
 			free(ctlr);
-			print("rtl8169: unknown mac %.4ux %.8ux\n", p->did, macv);
+			print("rtl8169: unknown mac %.4x %.8x\n", p->did, macv);
 			continue;
 		}
 

sys/src/9/386/ether82557.c

@@ -476,7 +476,7 @@ ifstat(Ether* ether, void* a, int32_t n, uint32_t offset)
 	for(i = 0; i < (1<<ctlr->eepromsz); i++){
 		if(i && ((i & 0x07) == 0))
 			len += snprint(p+len, READSTR-len, "\n       ");
-		len += snprint(p+len, READSTR-len, " %4.4ux", ctlr->eeprom[i]);
+		len += snprint(p+len, READSTR-len, " %4.4x", ctlr->eeprom[i]);
 	}
 
 	if((ctlr->eeprom[6] & 0x1F00) && !(ctlr->eeprom[6] & 0x8000)){
@@ -485,7 +485,7 @@ ifstat(Ether* ether, void* a, int32_t n, uint32_t offset)
 		for(i = 0; i < 6; i++){
 			//static int miir(Ctlr*, int, int);
 
-			len += snprint(p+len, READSTR-len, " %4.4ux",
+			len += snprint(p+len, READSTR-len, " %4.4x",
 				miir(ctlr, phyaddr, i));
 		}
 	}

sys/src/9/386/i8042.c

@@ -145,7 +145,7 @@ mousecmd(int cmd)
 	iunlock(&i8042lock);
 
 	if(c != 0xFA){
-		print("mousecmd: %2.2ux returned to the %2.2ux command\n", c, cmd);
+		print("mousecmd: %2.2x returned to the %2.2x command\n", c, cmd);
 		badkbd = 1;	/* don't keep trying; there might not be one */
 		return -1;
 	}

sys/src/9/386/pci.c

@@ -420,7 +420,7 @@ pcirouting(void)
 			break;
 
 	if(i == nelem(southbridges)) {
-		print("pcirouting: ignoring south bridge %T %.4ux/%.4ux\n", tbdf, sbpci->vid, sbpci->did);
+		print("pcirouting: ignoring south bridge %T %.4x/%.4x\n", tbdf, sbpci->vid, sbpci->did);
 		return;
 	}
 	southbridge = &southbridges[i];
@@ -430,10 +430,10 @@ pcirouting(void)
 	size = (r->size[1] << 8)|r->size[0];
 	for(e = (Slot *)&r[1]; (uint8_t *)e < p + size; e++) {
 		if(0){
-			print("%.2ux/%.2ux %.2ux: ", e->bus, e->dev, e->slot);
+			print("%.2x/%.2x %.2x: ", e->bus, e->dev, e->slot);
 			for (i = 0; i != 4; i++) {
 				uint8_t *m = &e->maps[i * 3];
-				print("[%d] %.2ux %.4ux ",
+				print("[%d] %.2x %.4x ",
 					i, m[0], (m[2] << 8)|m[1]);
 			}
 			print("\n");
@@ -660,7 +660,7 @@ pcilhinv(Pcidev* p)
 	Pcidev *t;
 
 	for(t = p; t != nil; t = t->link) {
-		print("%d  %2d/%d %.2ux %.2ux %.2ux %.4ux %.4ux %3d  ",
+		print("%d  %2d/%d %.2x %.2x %.2x %.4x %.4x %3d  ",
 			BUSBNO(t->tbdf), BUSDNO(t->tbdf), BUSFNO(t->tbdf),
 			t->ccrb, t->ccru, t->ccrp, t->vid, t->did, t->intl);
 

sys/src/9/amd64/archamd64.c

@@ -237,12 +237,12 @@ cpuiddump(void)
 
 	for(i = 0; i < machp()->CPU.ncpuinfos; i++){
 		cpuid(i, 0, info);
-		DBG("eax = %#8.8ux: %8.8ux %8.8ux %8.8ux %8.8ux\n",
+		DBG("eax = %#8.8ux: %8.8x %8.8x %8.8x %8.8x\n",
 			i, info[0], info[1], info[2], info[3]);
 	}
 	for(i = 0; i < machp()->CPU.ncpuinfoe; i++){
 		cpuid(0x80000000|i, 0, info);
-		DBG("eax = %#8.8ux: %8.8ux %8.8ux %8.8ux %8.8ux\n",
+		DBG("eax = %#8.8ux: %8.8x %8.8x %8.8x %8.8x\n",
 			0x80000000|i, info[0], info[1], info[2], info[3]);
 	}
 }

sys/src/9/amd64/devusb.c

@@ -194,7 +194,7 @@ seprintdata(char *s, char *se, unsigned char *d, int n)
 	if(l > 10)
 		l = 10;
 	for(i=0; i<l; i++)
-		s = seprint(s, se, " %2.2ux", d[i]);
+		s = seprint(s, se, " %2.2x", d[i]);
 	if(l < n)
 		s = seprint(s, se, "...");
 	return s;

sys/src/9/amd64/ether82563.c

@@ -713,11 +713,11 @@ i82563ifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 	p = seprint(p, e, "rintr: %u %u\n", ctlr->rintr, ctlr->rsleep);
 	p = seprint(p, e, "tintr: %u %u\n", ctlr->tintr, ctlr->txdw);
 	p = seprint(p, e, "ixcs: %u %u %u\n", ctlr->ixsm, ctlr->ipcs, ctlr->tcpcs);
-	p = seprint(p, e, "ctrl: %.8ux\n", csr32r(ctlr, Ctrl));
-	p = seprint(p, e, "ctrlext: %.8ux\n", csr32r(ctlr, Ctrlext));
-	p = seprint(p, e, "status: %.8ux\n", csr32r(ctlr, Status));
-	p = seprint(p, e, "txcw: %.8ux\n", csr32r(ctlr, Txcw));
-	p = seprint(p, e, "txdctl: %.8ux\n", csr32r(ctlr, Txdctl));
+	p = seprint(p, e, "ctrl: %.8x\n", csr32r(ctlr, Ctrl));
+	p = seprint(p, e, "ctrlext: %.8x\n", csr32r(ctlr, Ctrlext));
+	p = seprint(p, e, "status: %.8x\n", csr32r(ctlr, Status));
+	p = seprint(p, e, "txcw: %.8x\n", csr32r(ctlr, Txcw));
+	p = seprint(p, e, "txdctl: %.8x\n", csr32r(ctlr, Txdctl));
 	p = seprint(p, e, "pbs: %dKB\n", ctlr->pbs);
 	p = seprint(p, e, "pba: %#.8ux\n", ctlr->pba);
 
@@ -730,7 +730,7 @@ i82563ifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 //	for(i = 0; i < 0x40; i++){
 //		if(i && ((i & 7) == 0))
 //			p = seprint(p, e, "\n       ");
-//		p = seprint(p, e, " %4.4ux", ctlr->eeprom[i]);
+//		p = seprint(p, e, " %4.4x", ctlr->eeprom[i]);
 //	}
 //	p = seprint(p, e, "\n");
 

sys/src/9/amd64/etherbcm.c.NO

@@ -542,7 +542,7 @@ bcminterrupt(Ureg*u, void *arg)
 	if(status & LinkStateChange)
 		checklink(edev);
 	if(0)
-		iprint("bcm: interrupt %.8ux %.8ux\n", ctlr->status[2], ctlr->status[4]);
+		iprint("bcm: interrupt %.8x %.8x\n", ctlr->status[2], ctlr->status[4]);
 	bcmreceive(edev);
 	bcmtransclean(edev);
 	bcmtransmit(edev);

sys/src/9/amd64/ioapic.c

@@ -119,7 +119,7 @@ ioapicintrinit(int busno, int apicno, int intin, int devno, uint32_t lo)
 				busno, apicno, intin, devno, lo, rdt->lo);
 			return;
 		}
-		DBG("dup rdt %d %d %d %d %.8ux\n", busno, apicno, intin, devno, lo);
+		DBG("dup rdt %d %d %d %d %.8x\n", busno, apicno, intin, devno, lo);
 	}
 	rdt->ref++;
 	rbus = malloc(sizeof *rbus);

sys/src/9/amd64/root/cpu.c

@@ -517,7 +517,7 @@ netkeysrvauth(int fd, char *user)
 static void
 mksecret(char *t, uint8_t *f)
 {
-	sprint(t, "%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux",
+	sprint(t, "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		f[0], f[1], f[2], f[3], f[4], f[5], f[6], f[7], f[8], f[9]);
 }
 
@@ -665,7 +665,7 @@ loghex(uint8_t *p, int n)
 	int i;
 
 	for(i = 0; i < n; i++)
-		sprint(buf+2*i, "%2.2ux", p[i]);
+		sprint(buf+2*i, "%2.2x", p[i]);
 	syslog(0, "cpu", buf);
 }
 

sys/src/9/ip/arp.c

@@ -536,7 +536,7 @@ static void
 convmac(char *p, char *ep, uint8_t *mac, int n)
 {
 	while(n-- > 0)
-		p = seprint(p, ep, "%2.2ux", *mac++);
+		p = seprint(p, ep, "%2.2x", *mac++);
 }
 
 int

sys/src/9/ip/ipmux.c

@@ -794,12 +794,12 @@ ipmuxsprint(Ipmux *mux, int level, char *buf, int len)
                mux->off+((int)mux->skiphdr)*((int64_t)ipoff->data),
                mux->off+(((int)mux->skiphdr)*((int64_t)ipoff->data))+mux->len-1);
 	for(i = 0; i < mux->len; i++)
-		n += snprint(buf+n, len - n, "%2.2ux", mux->mask[i]);
+		n += snprint(buf+n, len - n, "%2.2x", mux->mask[i]);
 	n += snprint(buf+n, len-n, "=");
 	v = mux->val;
 	for(j = 0; j < mux->n; j++){
 		for(i = 0; i < mux->len; i++)
-			n += snprint(buf+n, len - n, "%2.2ux", *v++);
+			n += snprint(buf+n, len - n, "%2.2x", *v++);
 		n += snprint(buf+n, len-n, "|");
 	}
 	n += snprint(buf+n, len-n, "\n");

sys/src/9/port/devcap.c

@@ -121,7 +121,7 @@ hashstr(uchar *hash)
 	int i;
 
 	for(i = 0; i < Hashlen; i++)
-		sprint(buf+2*i, "%2.2ux", hash[i]);
+		sprint(buf+2*i, "%2.2x", hash[i]);
 	buf[2*Hashlen] = 0;
 	return buf;
 }

sys/src/9/port/devdraw.c

@@ -1435,7 +1435,7 @@ printmesg(char *fmt, unsigned char *a, int plsprnt)
 			a += 2;
 			break;
 		case 'S':
-			q += snprint(q, left, " %.4ux", BGSHORT(a));
+			q += snprint(q, left, " %.4x", BGSHORT(a));
 			a += 2;
 			break;
 		}

sys/src/9/port/devproc.c

@@ -649,7 +649,7 @@ procfdprint(Chan *c, int fd, int w, char *s, int ns)
 
 	if(w == 0)
 		w = procqidwidth(c);
-	n = snprint(s, ns, "%3d %.2s %C %4ud (%.16llux %*lud %.2ux) %5ld %8lld %s\n",
+	n = snprint(s, ns, "%3d %.2s %C %4ud (%.16llux %*lud %.2x) %5ld %8lld %s\n",
 		fd,
 		&"r w rw"[(c->mode&3)<<1],
 		c->dev->dc, c->devno,

sys/src/9/port/netif.c

@@ -250,7 +250,7 @@ netifread(Netif *nif, Chan *c, void *a, int32_t n, int64_t off)
 		j += snprint(p+j, READSTR-j, "mbps: %d\n", nif->mbps);
 		j += snprint(p+j, READSTR-j, "addr: ");
 		for(i = 0; i < nif->alen; i++)
-			j += snprint(p+j, READSTR-j, "%2.2ux", nif->addr[i]);
+			j += snprint(p+j, READSTR-j, "%2.2x", nif->addr[i]);
 		snprint(p+j, READSTR-j, "\n");
 		n = readstr(offset, a, n, p);
 		free(p);
@@ -259,7 +259,7 @@ netifread(Netif *nif, Chan *c, void *a, int32_t n, int64_t off)
 		p = malloc(READSTR);
 		j = 0;
 		for(i = 0; i < nif->alen; i++)
-			j += snprint(p+j, READSTR-j, "%2.2ux", nif->addr[i]);
+			j += snprint(p+j, READSTR-j, "%2.2x", nif->addr[i]);
 		n = readstr(offset, a, n, p);
 		free(p);
 		return n;

sys/src/9/root/cpu.c

@@ -513,7 +513,7 @@ netkeysrvauth(int fd, char *user)
 static void
 mksecret(char *t, uint8_t *f)
 {
-	sprint(t, "%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux",
+	sprint(t, "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		f[0], f[1], f[2], f[3], f[4], f[5], f[6], f[7], f[8], f[9]);
 }
 
@@ -580,7 +580,7 @@ loghex(uint8_t *p, int n)
 	int i;
 
 	for(i = 0; i < n; i++)
-		sprint(buf+2*i, "%2.2ux", p[i]);
+		sprint(buf+2*i, "%2.2x", p[i]);
 	syslog(0, "cpu", buf);
 }
 

sys/src/9/root/suck.c

@@ -175,7 +175,7 @@ dumptpkt(Tpkt* tpkt, int hflag, int dflag)
 #else
 		t = (uint8_t*)tpkt;
 		for(i = 0; i < 8; i++)
-			p = seprint(p, e, " %2.2ux", t[i]);
+			p = seprint(p, e, " %2.2x", t[i]);
 		p = seprint(p, e, "\n");
 #endif /* notdef */
 
@@ -192,9 +192,9 @@ dumptpkt(Tpkt* tpkt, int hflag, int dflag)
 
 	n -= sizeof(Tpkt);
 	for(i = 0; i < n; i += 16){
-		p = seprint(buf, e, "%4.4ux:", i);
+		p = seprint(buf, e, "%4.4x:", i);
 		for(j = 0; j < 16; j++)
-			seprint(p, e, " %2.2ux", tpkt->payload[i+j]);
+			seprint(p, e, " %2.2x", tpkt->payload[i+j]);
 		print("%s\n", buf);
 	}
 }

sys/src/cmd/9660srv/9660srv.c

@@ -786,7 +786,7 @@ nstr(uint8_t *p, int n)
 		if(' ' <= *p && *p <= '~')
 			*q++ = *p++;
 		else
-			q += sprint(q, "\\%2.2ux", *p++);
+			q += sprint(q, "\\%2.2x", *p++);
 	}
 	*q = 0;
 	return buf;

sys/src/cmd/aquarela/aquarela.c

@@ -75,7 +75,7 @@ smblogdata(h.command, smblogprint, p, n, 0x1000);
 smblogunlock();
 	ote = smboptable + h.command;
 	if (ote->name == nil) {
-		smblogprint(-1, "smb: illegal opcode 0x%.2ux\n", h.command);
+		smblogprint(-1, "smb: illegal opcode 0x%.2x\n", h.command);
 		goto unimp;
 	}
 	if (ote->process == nil) {
@@ -84,7 +84,7 @@ smblogunlock();
 	}
 	if (smbs->nextcommand != SMB_COM_NO_ANDX_COMMAND
 		&& smbs->nextcommand != h.command) {
-		smblogprint(-1, "smb: wrong command - expected %.2ux\n", smbs->nextcommand);
+		smblogprint(-1, "smb: wrong command - expected %.2x\n", smbs->nextcommand);
 		goto misc;
 	}
 	smbs->nextcommand = SMB_COM_NO_ANDX_COMMAND;
@@ -96,7 +96,7 @@ smblogunlock();
 		break;
 	default:
 		if (smbs->state != SmbSessionEstablished) {
-			smblogprint(-1, "aquarela: command %.2ux unexpected\n", h.command);
+			smblogprint(-1, "aquarela: command %.2x unexpected\n", h.command);
 			goto unimp;
 		}
 	}

sys/src/cmd/aquarela/cifscmd.c

@@ -175,7 +175,7 @@ cmdopen(SmbClient *c, int argc, char *argv[])
 		}
 		return (errclass << 16) | error;
 	}
-	print("fid 0x%.4ux attr 0x%.4ux time %ld size %lu accessallowed %u\n",
+	print("fid 0x%.4x attr 0x%.4x time %ld size %lu accessallowed %u\n",
 		fid, attr, mtime, size, accessallowed);
 	return 0;
 }

sys/src/cmd/aquarela/dump.c

@@ -36,7 +36,7 @@ nbnsdumpname(NbName name)
 			break;
 		print("%c", tolower(name[x]));
 	}
-	print("\\x%.2ux", name[NbNameLen - 1]);
+	print("\\x%.2x", name[NbNameLen - 1]);
 }
 
 void
@@ -78,7 +78,7 @@ nbnsdumpmessageresource(NbnsMessageResource *r, char *name)
 		int i;
 		print(" rdata: ");
 		for (i = 0; i < r->rdlength; i++)
-			print("%.2ux", r->rdata[i]);
+			print("%.2x", r->rdata[i]);
 	}
 	print("\n");
 }
@@ -88,7 +88,7 @@ nbnsdumpmessage(NbnsMessage *s)
 {
 	NbnsMessageQuestion *q;
 	NbnsMessageResource *r;
-	print("0x%.4ux %s %s (%d)",
+	print("0x%.4x %s %s (%d)",
 		s->id, opname(s->opcode), s->response ? "response" : "request", s->opcode);
 	if (s->broadcast)
 		print(" B");
@@ -124,9 +124,9 @@ nbdumpdata(void *ap, int32_t n)
 		int b;
 		print("0x%.4lux  ", i);
 		for (b = 0; b < l; b += 2) {
-			print(" %.2ux", p[i + b]);
+			print(" %.2x", p[i + b]);
 			if (b < l - 1)
-				print("%.2ux", p[i + b + 1]);
+				print("%.2x", p[i + b + 1]);
 			else
 				print("  ");
 		}

sys/src/cmd/aquarela/nbdgram.c

@@ -55,7 +55,7 @@ udplistener(void *)
 			if (n) {
 				switch (s.type) {
 				case NbDgramError:
-					print("nbdgramlisten: error: ip %I port %d code 0x%.2ux\n", s.srcip, s.srcport, s.error.code);
+					print("nbdgramlisten: error: ip %I port %d code 0x%.2x\n", s.srcip, s.srcport, s.error.code);
 					break;
 				case NbDgramDirectUnique:
 				case NbDgramDirectGroup:

sys/src/cmd/aquarela/nbdgramdump.c

@@ -12,11 +12,11 @@
 void
 nbdgramdump(NbDgram *s)
 {
-	print("type 0x%.2ux flags 0x%.2ux id 0x%.4ux srcip %I port %d\n",
+	print("type 0x%.2x flags 0x%.2x id 0x%.4x srcip %I port %d\n",
 		s->type, s->flags, s->id, s->srcip, s->srcport);
 	switch (s->type) {
 	case NbDgramError:
-		print("\terror.code 0x%.2ux\n", s->error.code);
+		print("\terror.code 0x%.2x\n", s->error.code);
 		break;
 	case NbDgramDirectUnique:
 	case NbDgramDirectGroup:

sys/src/cmd/aquarela/nbss.c

@@ -95,7 +95,7 @@ tcpreader(void *a)
 		if (n != length)
 			goto die;
 		if (flags & 0xfe) {
-			print("nbss: invalid flags field 0x%.2ux\n", flags);
+			print("nbss: invalid flags field 0x%.2x\n", flags);
 			goto die;
 		}
 		switch (buf[0]) {
@@ -181,7 +181,7 @@ tcpreader(void *a)
 		case 0x85: /* keep awake */
 			break;
 		default:
-			print("nbss: opcode 0x%.2ux unexpected\n", buf[0]);
+			print("nbss: opcode 0x%.2x unexpected\n", buf[0]);
 			goto die;
 		}
 	}
@@ -328,7 +328,7 @@ nbssconnect(NbName to, NbName from)
 	switch (msg[0]) {
 	default:
 		close(fd);
-		werrstr("unexpected session message code 0x%.2ux", msg[0]);
+		werrstr("unexpected session message code 0x%.2x", msg[0]);
 		return nil;
 	case 0x82:
 		if (length != 0) {
@@ -348,7 +348,7 @@ nbssconnect(NbName to, NbName from)
 			return nil;
 		}
 		close(fd);
-		werrstr("negative session response 0x%.2ux", msg[4]);
+		werrstr("negative session response 0x%.2x", msg[4]);
 		return nil;
 	}
 	s = nbemalloc(sizeof(Session));
@@ -382,7 +382,7 @@ again:
 	}
 	flags = hdr[1];
 	length = nhgets(hdr + 2) | ((flags & 1) << 16);
-//print("%.2ux: %d\n", hdr[0], length);
+//print("%.2x: %d\n", hdr[0], length);
 	switch (hdr[0]) {
 	case 0x85:
 		if (length != 0) {
@@ -393,7 +393,7 @@ again:
 	case 0x00:
 		break;
 	default:
-		werrstr("unexpected session message code 0x%.2ux", hdr[0]);
+		werrstr("unexpected session message code 0x%.2x", hdr[0]);
 		goto dead;
 	}
 	if (length > l) {

sys/src/cmd/aquarela/smbcomdelete.c

@@ -48,7 +48,7 @@ smbcomdelete(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	if (!smbbuffergetb(b, &fmt) || fmt != 0x04
 		|| !smbbuffergetstring(b, h, SMB_STRING_PATH, &pattern))
 		return SmbProcessResultFormat;
-	smblogprint(SMB_COM_DELETE, "searchattributes: 0x%.4ux\npattern:%s\n", sattr, pattern);
+	smblogprint(SMB_COM_DELETE, "searchattributes: 0x%.4x\npattern:%s\n", sattr, pattern);
 	smbpathsplit(pattern, &dir, &name);
 	t = smbidmapfind(s->tidmap, h->tid);
 	if (t == nil) {

sys/src/cmd/aquarela/smbcomlocking.c

@@ -65,16 +65,16 @@ smbcomlockingandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	timeout = smbnhgetl(pdata); pdata += 4;
 	numberofunlocks = smbnhgets(pdata); pdata += 2;
 	numberoflocks = smbnhgets(pdata);
-	smblogprint(h->command, "smbcomlockingandx: fid 0x%.4ux locktype 0x%.2ux oplocklevel 0x%.2ux timeout %lu numberofunlocks %d numberoflocks %u\n",
+	smblogprint(h->command, "smbcomlockingandx: fid 0x%.4x locktype 0x%.2x oplocklevel 0x%.2x timeout %lu numberofunlocks %d numberoflocks %u\n",
 		fid, locktype, oplocklevel, timeout, numberofunlocks, numberoflocks);
 	large = locktype & 0x10;
 	locktype &= ~0x10;
 	if (locktype != 0 || oplocklevel != 0) {
-		smblogprint(-1, "smbcomlockingandx: locktype 0x%.2ux unimplemented\n", locktype);
+		smblogprint(-1, "smbcomlockingandx: locktype 0x%.2x unimplemented\n", locktype);
 		return SmbProcessResultUnimp;
 	}
 	if (oplocklevel != 0) {
-		smblogprint(-1, "smbcomlockingandx: oplocklevel 0x%.2ux unimplemented\n", oplocklevel);
+		smblogprint(-1, "smbcomlockingandx: oplocklevel 0x%.2x unimplemented\n", oplocklevel);
 		return SmbProcessResultUnimp;
 	}
 	t = smbidmapfind(s->tidmap, h->tid);
@@ -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%.4ux offset %llud length %llud\n",
+		smblogprint(h->command, "smbcomlockingandx: unlock pid 0x%.4x offset %llud length %llud\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%.4ux offset %llud length %llud\n",
+		smblogprint(h->command, "smbcomlockingandx: lock pid 0x%.4x offset %llud length %llud\n",
 			pid, offset, length);
 		if (!smbsharedfilelock(f->sf, s, h->pid, offset, offset + length))
 			break;

sys/src/cmd/aquarela/smbcommon.c

@@ -61,7 +61,7 @@ smbchaincommand(SmbSession *s, SmbHeader *h, uint32_t andxoffsetfixup,
 	h->command = cmd;
 	ote = smboptable + cmd;
 	if (ote->process == nil) {
-		smblogprint(-1, "smbchaincommand: %s (0x%.2ux) not implemented\n", ote->name, cmd);
+		smblogprint(-1, "smbchaincommand: %s (0x%.2x) not implemented\n", ote->name, cmd);
 		return SmbProcessResultUnimp;
 	}
 	if (!smbresponsealignl2(s, 2)
@@ -111,7 +111,7 @@ smbbuffergetheader(SmbBuffer *b, SmbHeader *h, uint8_t **parametersp,
 	h->command = rh->command;
 	ote = smboptable + h->command;
 	if (ote->name == nil) {
-		smblogprint(-1, "smbgetheader: illegal opcode 0x%.2ux\n", h->command);
+		smblogprint(-1, "smbgetheader: illegal opcode 0x%.2x\n", h->command);
 		return 0;
 	}
 	h->errclass = rh->status[0];
@@ -119,7 +119,7 @@ smbbuffergetheader(SmbBuffer *b, SmbHeader *h, uint8_t **parametersp,
 	h->flags = rh->flags;
 	h->flags2 = smbnhgets(rh->flags2);
 	if (h->flags & ~(SmbHeaderFlagCaseless | SMB_FLAGS_SERVER_TO_REDIR | SmbHeaderFlagReserved | SmbHeaderFlagServerIgnore))
-		smblogprint(-1, "smbgetheader: warning: unexpected flags 0x%.2ux\n", h->flags);
+		smblogprint(-1, "smbgetheader: warning: unexpected flags 0x%.2x\n", h->flags);
 	h->wordcount = rh->wordcount;
 	if (parametersp)
 		*parametersp = smbbufferreadpointer(b);
@@ -136,7 +136,7 @@ smbbuffergetheader(SmbBuffer *b, SmbHeader *h, uint8_t **parametersp,
 	if (!smbbufferpushreadlimit(b, smbbufferreadoffset(b) + *bytecountp))
 		return 0;
 
-smblogprint(h->command, "%s %s: tid 0x%.4ux pid 0x%.4ux uid 0x%.4ux mid 0x%.4ux\n", ote->name,
+smblogprint(h->command, "%s %s: tid 0x%.4x pid 0x%.4x uid 0x%.4x mid 0x%.4x\n", ote->name,
 	(h->flags & SMB_FLAGS_SERVER_TO_REDIR) ? "response" : "request", h->tid, h->pid, h->uid, h->mid);
 	return 1;
 }
@@ -155,7 +155,7 @@ int
 smbcheckheader(SmbHeader *h, uint8_t command, int response, char **errmsgp)
 {
 	if (response && h->command != command) {
-		smbstringprint(errmsgp, "sent %.2uc request, got %.2ux response", command, h->command);
+		smbstringprint(errmsgp, "sent %.2uc request, got %.2x response", command, h->command);
 		return 0;
 	}
 	if (!smbcheckheaderdirection(h, response, errmsgp))

sys/src/cmd/aquarela/smbcomopen.c

@@ -105,7 +105,7 @@ openfile(SmbSession *s, SmbTree *t, char *path, uint16_t mode,
 			smbseterror(s, ERRDOS, ERRunsup);
 			goto done;
 		}
-//smblogprint(-1, "creating: attr 0x%.4ux co 0x%.8lux\n", attr, createoptions);
+//smblogprint(-1, "creating: attr 0x%.4x co 0x%.8lux\n", attr, createoptions);
 		if (createoptions & SMB_CO_FILE) {
 			attr &= SMB_ATTR_DIRECTORY;
 			if (attr == 0)
@@ -116,7 +116,7 @@ openfile(SmbSession *s, SmbTree *t, char *path, uint16_t mode,
 			attr |= SMB_ATTR_DIRECTORY;
 			p9mode = OREAD;
 		}
-//smblogprint(-1, "creating: before conversion attr 0x%.4ux\n", attr);
+//smblogprint(-1, "creating: before conversion attr 0x%.4x\n", attr);
 		p9attr = smbdosattr2plan9mode(attr);
 //smblogprint(-1, "creating: after conversion p9attr 0%.uo\n", p9attr);
 		fd = create(fullpath, p9mode, p9attr);
@@ -154,7 +154,7 @@ openfile(SmbSession *s, SmbTree *t, char *path, uint16_t mode,
 		s->fidmap = smbidmapnew();
 	*fidp = smbidmapadd(s->fidmap, f);
 //smblogprint(h->command, "REPLY:\n t->id=0x%x fid=%d path=%s\n", t->id, *fidp, path);
-	smblogprintif(smbglobals.log.fids, "openfile: 0x%.4ux/0x%.4ux %s\n", t->id, *fidp, path);
+	smblogprintif(smbglobals.log.fids, "openfile: 0x%.4x/0x%.4x %s\n", t->id, *fidp, path);
 	if (actionp)
 		*actionp = action;
 	if (dp) {
@@ -208,7 +208,7 @@ smbcomopenandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	}
 
 	smbloglock();
-	smblogprint(h->command, "flags 0x%.4ux", flags);
+	smblogprint(h->command, "flags 0x%.4x", flags);
 	if (flags & SMB_OPEN_FLAGS_ADDITIONAL)
 		smblogprint(h->command, " additional");
 	if (flags & SMB_OPEN_FLAGS_OPLOCK)
@@ -216,7 +216,7 @@ smbcomopenandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	if (flags & SMB_OPEN_FLAGS_OPBATCH)
 		smblogprint(h->command, " opbatch");
 	smblogprint(h->command, "\n");
-	smblogprint(h->command, "mode 0x%.4ux", mode);
+	smblogprint(h->command, "mode 0x%.4x", mode);
 	switch ((mode >> SMB_OPEN_MODE_ACCESS_SHIFT) & SMB_OPEN_MODE_ACCESS_MASK) {
 	case OREAD:
 		smblogprint(h->command, " OREAD");
@@ -251,14 +251,14 @@ smbcomopenandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	if (mode & SMB_OPEN_MODE_WRITE_THROUGH)
 		smblogprint(h->command, " write through");
 	smblogprint(h->command, "\n");
-	smblogprint(h->command, "sattr 0x%.4ux", sattr);
+	smblogprint(h->command, "sattr 0x%.4x", sattr);
 	smblogprintattr(h->command, sattr);
 	smblogprint(h->command, "\n");
-	smblogprint(h->command, "attr 0x%.4ux", attr);
+	smblogprint(h->command, "attr 0x%.4x", attr);
 	smblogprintattr(h->command, attr);
 	smblogprint(h->command, "\n");
 	smblogprint(h->command, "createtime 0x%.8lux\n", createtime);
-	smblogprint(h->command, "ofun 0x%.4ux", ofun);
+	smblogprint(h->command, "ofun 0x%.4x", ofun);
 	if (ofun & SMB_OFUN_NOEXIST_CREATE)
 		smblogprint(h->command, " noexistscreate");
 	else
@@ -411,7 +411,7 @@ smbcomcreate(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 
 	smbloglock();
 	smblogprint(h->command, "path %s\n", path);
-	smblogprint(h->command, "attr 0x%.4ux", attr);
+	smblogprint(h->command, "attr 0x%.4x", attr);
 	smblogprintattr(h->command, attr);
 	smblogprint(h->command, "\n");
 	smblogprint(h->command, "createtime 0x%.8lux\n", createtime);
@@ -599,7 +599,7 @@ smbcomntcreateandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	smbsblutlogprint(h->command, cosblut, createoptions);
 	smblogprint(h->command, "\n");
 	smblogprint(h->command, "impersonationlevel 0x%.8lux\n", impersonationlevel);
-	smblogprint(h->command, "securityflags 0x%.2ux\n", securityflags);
+	smblogprint(h->command, "securityflags 0x%.2x\n", securityflags);
 	smblogprint(h->command, "path %s\n", path);
 
 	if (rootdirectoryfid != 0) {

sys/src/cmd/aquarela/smbcomsessionsetupandx.c

@@ -60,7 +60,7 @@ smbcomsessionsetupandx(SmbSession *s, SmbHeader *h, uint8_t *pdata,
 	case SMB_COM_OPEN_PRINT_FILE:
 		break;
 	default:
-		smblogprint(h->command, "smbcomsessionsetupandx: invalid andxcommand %s (0x%.2ux)\n",
+		smblogprint(h->command, "smbcomsessionsetupandx: invalid andxcommand %s (0x%.2x)\n",
 			smboptable[andxcommand].name, andxcommand);
 		goto fmtfail;
 	}

sys/src/cmd/aquarela/smbcomsetinfo.c

@@ -26,7 +26,7 @@ smbcomsetinformation2(SmbSession *s, SmbHeader *h, uint8_t *pdata,
 	mdate = smbnhgets(pdata + 10);
 	mtime = smbnhgets(pdata + 12);
 	smblogprint(h->command,
-		"smbcomsetinformation2: fid 0x%.4ux adate 0x%.4ux atime 0x%.4ux mdate 0x%.4ux mtime 0x%.4ux\n",
+		"smbcomsetinformation2: fid 0x%.4x adate 0x%.4x atime 0x%.4x mdate 0x%.4x mtime 0x%.4x\n",
 		fid, adate, atime, mdate, mtime);
 	t = smbidmapfind(s->tidmap, h->tid);
 	if (t == nil) {
@@ -100,7 +100,7 @@ smbcomsetinformation(SmbSession *s, SmbHeader *h, uint8_t *pdata,
 	if (!smbbuffergetstring(b, h, SMB_STRING_PATH, &name))
 		return SmbProcessResultFormat;
 	smblogprint(h->command,
-		"smbcomsetinformation: attr 0x%.4ux utime %lu path %s\n",
+		"smbcomsetinformation: attr 0x%.4x utime %lu path %s\n",
 		attr, utime, name);
 	if (utime) {
 		Dir d;

sys/src/cmd/aquarela/smbcomtreeconnectandx.c

@@ -67,7 +67,7 @@ smbcomtreeconnectandx(SmbSession *s, SmbHeader *h, uint8_t *pdata,
 	case SMB_COM_COPY:
 		break;
 	default:
-		smblogprint(h->command, "smbcomtreeconnectandx: invalid andxcommand %s (0x%.2ux)\n",
+		smblogprint(h->command, "smbcomtreeconnectandx: invalid andxcommand %s (0x%.2x)\n",
 			smboptable[andxcommand].name, andxcommand);
 		goto fmtfail;
 	}
@@ -77,7 +77,7 @@ smbcomtreeconnectandx(SmbSession *s, SmbHeader *h, uint8_t *pdata,
 	passwordlength = smbnhgets(pdata); //pdata += 2;
 //	bytecount = smbnhgets(pdata); pdata += 2;
 smblogprint(h->command, "passwordlength: %u\n", passwordlength);
-smblogprint(h->command, "flags: 0x%.4ux\n", flags);
+smblogprint(h->command, "flags: 0x%.4x\n", flags);
 	if (!smbbuffergetbytes(b, nil, passwordlength)) {
 		smblogprint(h->command, "smbcomtreeconnectandx: not enough bytes for password\n");
 		goto fmtfail;

sys/src/cmd/aquarela/smbcomwrite.c

@@ -115,7 +115,7 @@ smbcomwrite(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	count = smbnhgets(pdata); pdata += 2;
 	offset = smbnhgetl(pdata);
 
-	smblogprint(SMB_COM_WRITE, "smbcomwrite: fid 0x%.4ux count 0x%.4ux offset 0x%.8lux\n",
+	smblogprint(SMB_COM_WRITE, "smbcomwrite: fid 0x%.4x count 0x%.4x offset 0x%.8lux\n",
 		fid, count, offset);
 
 	if (!smbbuffergetb(b, &fmt)
@@ -194,7 +194,7 @@ smbcomwriteandx(SmbSession *s, SmbHeader *h, uint8_t *pdata, SmbBuffer *b)
 	if(h->wordcount == 14)
 		offset |= (int64_t)smbnhgetl(pdata)<<32;
 
-	smblogprint(SMB_COM_WRITE_ANDX, "smbcomwriteandx: fid 0x%.4ux count 0x%.4ux offset 0x%.llux\n",
+	smblogprint(SMB_COM_WRITE_ANDX, "smbcomwriteandx: fid 0x%.4x count 0x%.4x offset 0x%.llux\n",
 		fid, count, offset);
 
 

sys/src/cmd/aquarela/smbconnect.c

@@ -94,9 +94,9 @@ print("netbios session established\n");
 	peerinfo.utc =  (int64_t)secssince1970 * (int64_t)1000000000 + (utcintenthsofaus % 10000000) * 100;
 	peerinfo.tzoff = -smbnhgets(pdata) * 60; pdata += 2;
 	peerinfo.encryptionkeylength = *pdata++;
-	print("securitymode: 0x%.2ux\n", peerinfo.securitymode);
-	print("maxmpxcount: 0x%.4ux\n", peerinfo.maxmpxcount);
-	print("maxnumbervcs: 0x%.4ux\n", peerinfo.maxnumbervcs);
+	print("securitymode: 0x%.2x\n", peerinfo.securitymode);
+	print("maxmpxcount: 0x%.4x\n", peerinfo.maxmpxcount);
+	print("maxnumbervcs: 0x%.4x\n", peerinfo.maxnumbervcs);
 	print("maxbuffersize: 0x%.8lux\n", peerinfo.maxbuffersize);
 	print("maxrawsize: 0x%.8lux\n", peerinfo.maxrawsize);
 	print("sessionkey: 0x%.8lux\n", peerinfo.sessionkey);
@@ -111,7 +111,7 @@ print("netbios session established\n");
 	}
 	print("encryptionkey: ");
 	for (x = 0; x < peerinfo.encryptionkeylength; x++)
-		print("%.2ux", peerinfo.encryptionkey[x]);
+		print("%.2x", peerinfo.encryptionkey[x]);
 	print("\n");
 	if (!smbbuffergetucs2(b, 0, &peerinfo.oemdomainname)) {
 		smbstringprint(errmsgp, "not enough data for oemdomainname");

sys/src/cmd/aquarela/smbfile.c

@@ -27,7 +27,7 @@ smbfilefree(SmbFile **fp)
 void
 smbfileclose(SmbSession *s, SmbFile *f)
 {
-	smblogprintif(smbglobals.log.fids, "smbfileclose: 0x%.4ux/0x%.4ux %s%s\n",
+	smblogprintif(smbglobals.log.fids, "smbfileclose: 0x%.4x/0x%.4x %s%s\n",
 		f->t->id, f->id, f->t->serv->path, f->name);
 	smbidmapremove(s->fidmap, f);
 	smbfilefree(&f);

sys/src/cmd/aquarela/smblog.c

@@ -105,9 +105,9 @@ smblogdata(int cmd, int (*print)(int cmd, char *fmt, ...), void *ap,
 		int b;
 		(*print)(cmd, "0x%.4lux  ", i);
 		for (b = 0; b < l; b += 2) {
-			(*print)(cmd, " %.2ux", p[i + b]);
+			(*print)(cmd, " %.2x", p[i + b]);
 			if (b < l - 1)
-				(*print)(cmd, "%.2ux", p[i + b + 1]);
+				(*print)(cmd, "%.2x", p[i + b + 1]);
 			else
 				(*print)(cmd, "  ");
 		}
@@ -125,5 +125,5 @@ smblogdata(int cmd, int (*print)(int cmd, char *fmt, ...), void *ap,
 		i += l;
 	}
 	if (saven > limit)
-		(*print)(cmd, "0x%.4ux   ...\n0x%.4ux\n", limit, saven);
+		(*print)(cmd, "0x%.4x   ...\n0x%.4x\n", limit, saven);
 }

sys/src/cmd/aquarela/smbnegotiate.c

@@ -28,7 +28,7 @@ smbnegotiate(SmbSession *s, SmbHeader *h, uint8_t *, SmbBuffer *b)
 	while (smbbuffergetb(b, &bufferformat)) {
 		char *s;
 		if (bufferformat != 0x02) {
-			smblogprint(-1, "smbnegotiate: unrecognised buffer format 0x%.2ux\n", bufferformat);
+			smblogprint(-1, "smbnegotiate: unrecognised buffer format 0x%.2x\n", bufferformat);
 			return SmbProcessResultFormat;
 		}
 		if (!smbbuffergetstr(b, 0, &s)) {

sys/src/cmd/aquarela/smbtrans2find.c

@@ -26,7 +26,7 @@ void
 smbsearchclose(SmbSession *s, SmbSearch *search)
 {
 	if (search) {
-		smblogprintif(smbglobals.log.sids, "smbsearchclose: tid 0x%.4ux sid 0x%.4ux\n", search->t->id, search->id);
+		smblogprintif(smbglobals.log.sids, "smbsearchclose: tid 0x%.4x sid 0x%.4x\n", search->t->id, search->id);
 		smbidmapremove(s->sidmap, search);
 		smbsearchfree(&search);
 	}
@@ -49,7 +49,7 @@ smbsearchnew(SmbSession *s, SmbDirCache *dc, Reprog *r, SmbTree *t)
 	search->dc = dc;
 	search->rep = r;
 	search->t = t;
-	smblogprintif(smbglobals.log.sids, "smbsearchnew: 0x%.4ux\n", search->id);
+	smblogprintif(smbglobals.log.sids, "smbsearchnew: 0x%.4x\n", search->id);
 	return search;
 }
 
@@ -193,16 +193,16 @@ poolcheck(mainmem);
 		goto done;
 	}
 	smbloglock();
-	smblogprintif(debug, "searchattributes: 0x%.4ux\n", searchattributes);
-	smblogprintif(debug, "searchcount: 0x%.4ux\n", searchcount);
-	smblogprintif(debug, "flags: 0x%.4ux\n", flags);
-	smblogprintif(debug, "informationlevel: 0x%.4ux\n", informationlevel);
+	smblogprintif(debug, "searchattributes: 0x%.4x\n", searchattributes);
+	smblogprintif(debug, "searchcount: 0x%.4x\n", searchcount);
+	smblogprintif(debug, "flags: 0x%.4x\n", flags);
+	smblogprintif(debug, "informationlevel: 0x%.4x\n", informationlevel);
 	smblogprintif(debug, "searchstoragetype: 0x%.8lux\n", searchstoragetype);
 	smblogprintif(debug, "pattern: %s\n", pattern);
 	smblogunlock();
 	smbpathsplit(pattern, &dir, &name);
 	if (informationlevel != SMB_INFO_STANDARD && informationlevel != SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
-		smblogprint(-1, "smbtrans2findfirst2: infolevel 0x%.4ux not implemented\n", informationlevel);
+		smblogprint(-1, "smbtrans2findfirst2: infolevel 0x%.4x not implemented\n", informationlevel);
 		smbseterror(s, ERRDOS, ERRunknownlevel);
 		pr = SmbProcessResultError;
 		goto done;
@@ -283,11 +283,11 @@ smbtrans2findnext2(SmbSession *s, SmbHeader *h)
 		goto done;
 	}
 	smblogprintif(debug,
-		"smbtrans2findnext2: sid %d scount %d infolevel 0x%.4ux resumekey %lu flags 0x%.4ux filename %s\n",
+		"smbtrans2findnext2: sid %d scount %d infolevel 0x%.4x resumekey %lu flags 0x%.4x filename %s\n",
 		sid, scount, infolevel, resumekey, flags, filename);
 
 	if (infolevel != SMB_INFO_STANDARD && infolevel != SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
-		smblogprint(-1, "smbtrans2findnext2: infolevel 0x%.4ux not implemented\n", infolevel);
+		smblogprint(-1, "smbtrans2findnext2: infolevel 0x%.4x not implemented\n", infolevel);
 		smbseterror(s, ERRDOS, ERRunknownlevel);
 		pr = SmbProcessResultError;
 		goto done;

sys/src/cmd/aquarela/smbtrans2query.c

@@ -106,7 +106,7 @@ query(SmbSession *s, char *cmdname, char *filename, uint16_t infolevel,
 		/* don't do it, never will */
 		goto unknownlevel;
 	default:
-		smblogprint(-1, "smbtrans2query%sinformation: infolevel 0x%.4ux not implemented\n", cmdname, infolevel);
+		smblogprint(-1, "smbtrans2query%sinformation: infolevel 0x%.4x not implemented\n", cmdname, infolevel);
 	unknownlevel:
 		translogprint(s->transaction.in.setup[0], "[not supported]\n");
 		smbseterror(s, ERRDOS, ERRunknownlevel);
@@ -138,7 +138,7 @@ smbtrans2querypathinformation(SmbSession *s, SmbHeader *h)
 		pr = SmbProcessResultMisc;
 		goto done;
 	}
-	translogprint(s->transaction.in.setup[0], "infolevel 0x%.4ux\n", infolevel);
+	translogprint(s->transaction.in.setup[0], "infolevel 0x%.4x\n", infolevel);
 	translogprint(s->transaction.in.setup[0], "path %s\n", path);
 	fullpath = nil;
 	smbstringprint(&fullpath, "%s%s", t->serv->path, path);
@@ -176,8 +176,8 @@ smbtrans2queryfileinformation(SmbSession *s, SmbHeader *h)
 		pr = SmbProcessResultMisc;
 		goto done;
 	}
-	translogprint(s->transaction.in.setup[0], "fid 0x%.4ux\n", fid);
-	translogprint(s->transaction.in.setup[0], "infolevel 0x%.4ux\n", infolevel);
+	translogprint(s->transaction.in.setup[0], "fid 0x%.4x\n", fid);
+	translogprint(s->transaction.in.setup[0], "infolevel 0x%.4x\n", infolevel);
 	f = smbidmapfind(s->fidmap, fid);
 	if (f == nil) {
 		smbseterror(s, ERRDOS, ERRbadfid);
@@ -276,7 +276,7 @@ smbtrans2queryfsinformation(SmbSession *s, SmbHeader *h)
 			goto misc;
 		break;
 	default:
-		smblogprint(-1, "smbtrans2queryfsinformation: infolevel 0x%.4ux not implemented\n", infolevel);
+		smblogprint(-1, "smbtrans2queryfsinformation: infolevel 0x%.4x not implemented\n", infolevel);
 		smbseterror(s, ERRDOS, ERRunknownlevel);
 		pr = SmbProcessResultError;
 	}

sys/src/cmd/aquarela/smbtrans2set.c

@@ -100,7 +100,7 @@ smbtrans2setfileinformation(SmbSession *s, SmbHeader *h)
 		break;
 
 	default:
-		smblogprint(-1, "smbtrans2setfileinformation: infolevel 0x%.4ux not implemented\n", infolevel);
+		smblogprint(-1, "smbtrans2setfileinformation: infolevel 0x%.4x not implemented\n", infolevel);
 		smbseterror(s, ERRDOS, ERRunknownlevel);
 		pr = SmbProcessResultError;
 		break;
@@ -143,7 +143,7 @@ smbtrans2setpathinformation(SmbSession *s, SmbHeader *h)
 	smbstringprint(&fullpath, "%s%s", t->serv->path, path);
 
 	translogprint(s->transaction.in.setup[0], "path %s\n", path);
-	translogprint(s->transaction.in.setup[0], "infolevel 0x%.4ux\n", infolevel);
+	translogprint(s->transaction.in.setup[0], "infolevel 0x%.4x\n", infolevel);
 	translogprint(s->transaction.in.setup[0], "fullpath %s\n", fullpath);
 
 	switch (infolevel) {
@@ -199,7 +199,7 @@ smbtrans2setpathinformation(SmbSession *s, SmbHeader *h)
 		break;
 
 	default:
-		smblogprint(-1, "smbtrans2setpathinformation: infolevel 0x%.4ux not implemented\n", infolevel);
+		smblogprint(-1, "smbtrans2setpathinformation: infolevel 0x%.4x not implemented\n", infolevel);
 		smbseterror(s, ERRDOS, ERRunknownlevel);
 		pr = SmbProcessResultError;
 		break;

sys/src/cmd/aquarela/smbtree.c

@@ -48,7 +48,7 @@ smbtreedisconnect(SmbSession *s, SmbTree *t)
 {
 	if (t) {
 		DisconnectData data;
-		smblogprintif(smbglobals.log.tids, "smbtreedisconnect: 0x%.4ux\n", t->id);
+		smblogprintif(smbglobals.log.tids, "smbtreedisconnect: 0x%.4x\n", t->id);
 		data.s = s;
 		data.t = t;
 		smbserviceput(t->serv);
@@ -77,6 +77,6 @@ smbtreeconnect(SmbSession *s, SmbService *serv)
 	smbidmapadd(s->tidmap, t);
 	t->serv = serv;
 	smbserviceget(serv);
-	smblogprintif(smbglobals.log.tids, "smbtreeconnect: 0x%.4ux\n", t->id);
+	smblogprintif(smbglobals.log.tids, "smbtreeconnect: 0x%.4x\n", t->id);
 	return t;
 }

sys/src/cmd/aquarela/testconnect.c

@@ -52,9 +52,9 @@ threadmain(int argc, char *argv[])
 		rv = smbclienttrans2findfirst2(c, nelem(ip), "\\LICENSE",
 			&sid, &searchcount, &endofsearch, ip, &errmsg);
 		if (rv) {
-			print("sid 0x%.4ux\n", sid);
-			print("searchcount 0x%.4ux\n", searchcount);
-			print("endofsearch 0x%.4ux\n", endofsearch);
+			print("sid 0x%.4x\n", sid);
+			print("searchcount 0x%.4x\n", searchcount);
+			print("endofsearch 0x%.4x\n", endofsearch);
 		}
 		else
 			print("search failed %s\n", errmsg);

sys/src/cmd/aquarela/testnbdgram.c

@@ -47,7 +47,7 @@ deliver(void *, NbDgram *s)
 	print("name: %s\n", transaction.in.name);
 	print("setup:");
 	for (x = 0; x < transaction.in.scount; x++)
-		print(" 0x%.4ux", transaction.in.setup[x]);
+		print(" 0x%.4x", transaction.in.setup[x]);
 	print("\n");
 	print("parameters:\n");
 	nbdumpdata(transaction.in.parameters, transaction.in.tpcount);

sys/src/cmd/auth/authsrv.c

@@ -635,7 +635,7 @@ printresp(uint8_t resp[MSresplen])
 
 	p = buf;
 	for(i=0; i<MSresplen; i++)
-		p += sprint(p, "%.2ux ", resp[i]);
+		p += sprint(p, "%.2x ", resp[i]);
 	syslog(0, AUTHLOG, "resp = %s", buf);
 }
 

sys/src/cmd/auth/debug.c

@@ -250,7 +250,7 @@ authfutz(char *dom, char *user)
 	}
 	convM2T(tbuf, &t, key);
 	if(t.num != AuthTc){
-		print("\tcannot decrypt ticket1 from auth server (bad t.num=0x%.2ux)\n", t.num);
+		print("\tcannot decrypt ticket1 from auth server (bad t.num=0x%.2x)\n", t.num);
 		print("\tauth server and you do not agree on key for %s@%s\n", user, dom);
 		return;
 	}
@@ -263,7 +263,7 @@ authfutz(char *dom, char *user)
 
 	convM2T(tbuf+TICKETLEN, &t, key);
 	if(t.num != AuthTs){
-		print("\tcannot decrypt ticket2 from auth server (bad t.num=0x%.2ux)\n", t.num);
+		print("\tcannot decrypt ticket2 from auth server (bad t.num=0x%.2x)\n", t.num);
 		print("\tauth server and you do not agree on key for %s@%s\n", user, dom);
 		return;
 	}
@@ -286,7 +286,7 @@ authfutz(char *dom, char *user)
 	}
 	convM2T(tbuf, &t, key);
 	if(t.num != AuthTc){
-		print("\tcannot decrypt ticket1 from auth server (bad t.num=0x%.2ux)\n", t.num);
+		print("\tcannot decrypt ticket1 from auth server (bad t.num=0x%.2x)\n", t.num);
 		print("\tauth server and you do not agree on key for %s@%s\n", user, dom);
 		return;
 	}
@@ -308,7 +308,7 @@ authfutz(char *dom, char *user)
 
 	convM2T(tbuf+TICKETLEN, &t, booteskey);
 	if(t.num != AuthTs){
-		print("\tcannot decrypt ticket2 from auth server (bad t.num=0x%.2ux)\n", t.num);
+		print("\tcannot decrypt ticket2 from auth server (bad t.num=0x%.2x)\n", t.num);
 		print("\tauth server and you do not agree on key for %s@%s\n", tr.authid, dom);
 		return;
 	}

sys/src/cmd/auth/lib/netcheck.c

@@ -21,7 +21,7 @@ checksum(char key[], char csum[]) {
 
 	memset(buf, 0, 8);
 	encrypt(key, buf, 8);
-	sprint(csum, "C %.2ux%.2ux%.2ux%.2ux", buf[0], buf[1], buf[2], buf[3]);
+	sprint(csum, "C %.2x%.2x%.2x%.2x", buf[0], buf[1], buf[2], buf[3]);
 }
 
 /*

sys/src/cmd/auth/netkey.c

@@ -13,7 +13,6 @@
 #include <bio.h>
 #include "authcmdlib.h"
 
-
 void
 usage(void)
 {

sys/src/cmd/aux/mklatinkbd.c

@@ -146,7 +146,7 @@ printtrie(Biobuf *b, Trie *t)
 			Bprint(b, "{");
 			for(i=0; i<256; i++)
 				if(t->r[i])
-					Bprint(b, " 0x%.4ux,", t->r[i]);
+					Bprint(b, " 0x%.4x,", t->r[i]);
 			Bprint(b, " }");
 		} else {
 			Bprint(b, "L\"");

sys/src/cmd/aux/pcmcia.c

@@ -62,7 +62,7 @@ readc(void *x)
 	pos++;
 	rv = read(fd, x, 1);
 	if(hex)
-		print("%2.2ux ", *(uint8_t*)x);
+		print("%2.2x ", *(uint8_t*)x);
 	return rv;
 }
 

sys/src/cmd/aux/realemu/fmt.c

@@ -364,7 +364,7 @@ cpufmt(Fmt *fmt)
 		"%.6lux "
 		"%.8lux %.8lux %.8lux %.8lux %.8lux %.8lux %.8lux %.8lux "
 		"%.4lux %.4lux %.4lux %.4lux "
-		"%J %.4lux %.2ux %I",
+		"%J %.4lux %.2x %I",
 
 		cpu->ic,
 

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

@@ -1173,7 +1173,7 @@ dump(Vga* vga, Ctlr* ctlr)
 	printitem(ctlr->name, "arch");
 	Bprint(&stdout, " %d\n", nv->arch);
 	printitem(ctlr->name, "did");
-	Bprint(&stdout, " %.4ux\n", nv->did);
+	Bprint(&stdout, " %.4x\n", nv->did);
 	printitem(ctlr->name, "repaint0");
 	Bprint(&stdout, " %x\n", nv->repaint0);
 	printitem(ctlr->name, "repaint1");

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

@@ -416,7 +416,7 @@ pcihinv(Pcidev* p)
 		Bprint(&stdout, "bus dev type vid  did intl memory\n");
 	}
 	for(t = p; t != nil; t = t->link) {
-		Bprint(&stdout, "%d  %2d/%d %.4ux %.4ux %.4ux %2d  ",
+		Bprint(&stdout, "%d  %2d/%d %.4x %.4x %.4x %2d  ",
 			BUSBNO(t->tbdf), BUSDNO(t->tbdf), BUSFNO(t->tbdf),
 			t->ccru, t->vid, t->did, t->intl);
 

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

@@ -157,7 +157,7 @@ snarf(Vga* vga, Ctlr* ctlr)
 		break;
 
 	default:
-		error("%s: unrecognized chipset %.4ux\n", ctlr->name, p->did);
+		error("%s: unrecognized chipset %.4x\n", ctlr->name, p->did);
 	}
 
 	for(i=0; i<Nreg; i++)

sys/src/cmd/cdfs/scsi.c

@@ -104,7 +104,7 @@ scsierror(int asc, int ascq)
 	getcodes();
 
 	if(codes) {
-		snprint(search, sizeof search, "\n%.2ux%.2ux ", asc, ascq);
+		snprint(search, sizeof search, "\n%.2x%.2x ", asc, ascq);
 		if(p = strstr(codes, search)) {
 			p += 6;
 			if((q = strchr(p, '\n')) == nil)
@@ -113,17 +113,17 @@ scsierror(int asc, int ascq)
 			return buf;
 		}
 
-		snprint(search, sizeof search, "\n%.2ux00", asc);
+		snprint(search, sizeof search, "\n%.2x00", asc);
 		if(p = strstr(codes, search)) {
 			p += 6;
 			if((q = strchr(p, '\n')) == nil)
 				q = p+strlen(p);
-			snprint(buf, sizeof buf, "(ascq #%.2ux) %.*s", ascq, (int)(q-p), p);
+			snprint(buf, sizeof buf, "(ascq #%.2x) %.*s", ascq, (int)(q-p), p);
 			return buf;
 		}
 	}
 
-	snprint(buf, sizeof buf, "scsi #%.2ux %.2ux", asc, ascq);
+	snprint(buf, sizeof buf, "scsi #%.2x %.2x", asc, ascq);
 	return buf;
 }
 
@@ -308,10 +308,10 @@ scsi(Scsi *s, uint8_t *cmd, int ccount, void *v, int dcount, int io)
 
 	p = scsierror(code, sense[13]);
 
-	werrstr("cmd #%.2ux: %s", cmd[0], p);
+	werrstr("cmd #%.2x: %s", cmd[0], p);
 
 	if(scsiverbose)
-		fprint(2, "scsi cmd #%.2ux: %.2ux %.2ux %.2ux: %s\n",
+		fprint(2, "scsi cmd #%.2x: %.2x %.2x %.2x: %s\n",
 			cmd[0], key, code, sense[13], p);
 
 //	if(key == Sensenone)

sys/src/cmd/cfs/cfs.c

@@ -806,7 +806,7 @@ dump(uint8_t *p, int len)
 {
 	fprint(2, "%d bytes", len);
 	while(len-- > 0)
-		fprint(2, " %.2ux", *p++);
+		fprint(2, " %.2x", *p++);
 	fprint(2, "\n");
 }
 

sys/src/cmd/con/xmr.c

@@ -145,7 +145,7 @@ receive(int fd, uint8_t seqno)
 		/* If invalid block, resynchronize */
 		if(buf[0] != Soh || buf[2] != (255-buf[1]) || sum != buf[131]){
 			if(debug){
-				fprint(dfd, "resync %2.2ux %d %d %x %x\n", buf[0],
+				fprint(dfd, "resync %2.2x %d %d %x %x\n", buf[0],
 					buf[1], buf[2], sum, buf[131]);
 				write(dfd, (char*)buf+3, 128);
 				fprint(dfd, "\n");

sys/src/cmd/cpu.c

@@ -579,7 +579,7 @@ netkeysrvauth(int fd, char *user)
 static void
 mksecret(char *t, uint8_t *f)
 {
-	sprint(t, "%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux",
+	sprint(t, "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		f[0], f[1], f[2], f[3], f[4], f[5], f[6], f[7], f[8], f[9]);
 }
 
@@ -659,7 +659,7 @@ loghex(uint8_t *p, int n)
 	int i;
 
 	for(i = 0; i < n; i++)
-		sprint(buf+2*i, "%2.2ux", p[i]);
+		sprint(buf+2*i, "%2.2x", p[i]);
 	syslog(0, "cpu", buf);
 }
 

sys/src/cmd/cwfs/scsi.c

@@ -290,13 +290,13 @@ scsireqsense(Target* tp, char lun, int* nbytes, int quiet)
 buggery:
 	if(quiet == 0){
 		s = key[sense[2]&0x0F];
-		print("%s: reqsense: '%s' code #%2.2ux #%2.2ux\n",
+		print("%s: reqsense: '%s' code #%2.2x #%2.2x\n",
 			tp->id, s, sense[12], sense[13]);
-		print("%s: byte 2: #%2.2ux, bytes 15-17: #%2.2ux #%2.2ux #%2.2ux\n",
+		print("%s: byte 2: #%2.2x, bytes 15-17: #%2.2x #%2.2x #%2.2x\n",
 			tp->id, sense[2], sense[15], sense[16], sense[17]);
 		print("lastcmd (%d): ", lastcmdsz);
 		for(n = 0; n < lastcmdsz; n++)
-			print(" #%2.2ux", lastcmd[n]);
+			print(" #%2.2x", lastcmd[n]);
 		print("\n");
 	}
 

sys/src/cmd/cwfs/sub.c

@@ -915,7 +915,7 @@ hexdump(void *a, int n)
 	p = a;
 	s1[0] = 0;
 	for(i = 0; i < n; i++) {
-		sprint(s2, " %.2ux", p[i]);
+		sprint(s2, " %.2x", p[i]);
 		strcat(s1, s2);
 		if((i&7) == 7) {
 			print("%s\n", s1);

sys/src/cmd/dict/robert.c

@@ -165,7 +165,7 @@ robertprintentry(Entry *def, Entry *etym, int cmd)
 		case ITOFF:
 		case NONE:
 			if(debug)
-				outprint("\\%.2ux", c);
+				outprint("\\%.2x", c);
 			baseline = 0;
 			break;
 
@@ -282,7 +282,7 @@ robertflexentry(Entry e, int cmd)
 			continue;
 		if(r > MULTIE){
 			if(debug)
-				Bprint(bout, "\\%.2ux", c);
+				Bprint(bout, "\\%.2x", c);
 			continue;
 		}
 		if(r < Runeself)

sys/src/cmd/dict/world.c

@@ -156,7 +156,7 @@ putchar(int c, int *state)
 					break;
 				/* fall through */
 			default:
-				outprint("\\%.2ux", c);
+				outprint("\\%.2x", c);
 			}
 		}else if(state[2] == 0)
 			outrune(r);
@@ -179,7 +179,7 @@ putchar(int c, int *state)
 		else
 			r = NONE;
 		if(r == NONE)
-			outprint("\\%.2ux\\%.2ux", state[1], c);
+			outprint("\\%.2x\\%.2x", state[1], c);
 		else
 			outrune(r);
 		break;

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

@@ -181,7 +181,7 @@ dumpsome(char *ans, char *buf, int32_t count)
 		for(i=0; i<count; i++){
 			if(i>0 && i%4==0)
 				*p++ = ' ';
-			sprint(p, "%2.2ux", buf[i]);
+			sprint(p, "%2.2x", buf[i]);
 			p += 2;
 		}
 	}

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

@@ -669,7 +669,7 @@ hexdump(void *a, int n)
 	p = a;
 	s1[0] = 0;
 	for(i=0; i<n; i++) {
-		sprint(s2, " %.2ux", p[i]);
+		sprint(s2, " %.2x", p[i]);
 		strcat(s1, s2);
 		if((i&7) == 7) {
 			print("%s\n", s1);

sys/src/cmd/disk/rd9660.c

@@ -62,7 +62,7 @@ dumpbootvol(void *a)
 	Voldesc *v;
 
 	v = a;
-	print("magic %.2ux %.5s %.2ux %2ux\n",
+	print("magic %.2x %.5s %.2x %2ux\n",
 		v->magic[0], v->magic+1, v->magic[6], v->magic[7]);
 	if(v->magic[0] == 0xFF)
 		return;
@@ -70,7 +70,7 @@ dumpbootvol(void *a)
 	print("system %.32T\n", v->systemid);
 	print("volume %.32T\n", v->volumeid);
 	print("volume size %.4N\n", v->volsize);
-	print("charset %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux\n",
+	print("charset %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x\n",
 		v->charset[0], v->charset[1], v->charset[2], v->charset[3],
 		v->charset[4], v->charset[5], v->charset[6], v->charset[7]);
 	print("volume set size %.2N\n", v->volsetsize);

sys/src/cmd/dossrv/dossubs.c

@@ -40,7 +40,7 @@ isdosfs(uint8_t *buf)
 	if(buf[0] == 0xEB && buf[2] == 0x90 /* && buf[1] >= 0x30 */)
 		return 1;
 	if(chatty)
-		fprint(2, "bad sig %.2ux %.2ux %.2uxn", buf[0], buf[1], buf[2]);
+		fprint(2, "bad sig %.2x %.2x %.2xn", buf[0], buf[1], buf[2]);
 
 	return 0;
 }
@@ -1882,7 +1882,7 @@ dirdump(void *vdbuf)
 		name = namebuf + DOSNAMELEN;
 		*--name = '\0';
 		name = getnamerunes(name, dbuf, 1);
-		seprint(buf, ebuf, "\"%s\" %2.2x %2.2ux %2.2ux %d", name, dbuf[0], dbuf[12], dbuf[13], GSHORT(d->start));
+		seprint(buf, ebuf, "\"%s\" %2.2x %2.2x %2.2x %d", name, dbuf[0], dbuf[12], dbuf[13], GSHORT(d->start));
 	}else{
 		s = seprint(buf, ebuf, "\"%.8s.%.3s\" ", (char*)d->name,
 				(char*)d->ext);

sys/src/cmd/exportfs/exportfs.c

@@ -946,6 +946,6 @@ filter(int fd, char *cmd)
 static void
 mksecret(char *t, uint8_t *f)
 {
-	sprint(t, "%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux",
+	sprint(t, "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		f[0], f[1], f[2], f[3], f[4], f[5], f[6], f[7], f[8], f[9]);
 }

sys/src/cmd/fax/fax2receive.c

@@ -58,7 +58,7 @@ page(Modem *m, char *spool)
 			if(c == '\003')
 				break;
 			if(c != '\020'){
-				verbose("B%2.2ux", c);
+				verbose("B%2.2x", c);
 				continue;
 			}
 		}
@@ -107,7 +107,7 @@ receive(Modem *m, char *spool)
 		 * Check we have a valid page reponse.
 		 */
 		if((m->valid & Vfhng) == 0 && (m->valid & (Vfet|Vfpts)) != (Vfet|Vfpts)){
-			verbose("receive: invalid page reponse: #%4.4ux", m->valid);
+			verbose("receive: invalid page reponse: #%4.4x", m->valid);
 			return seterror(m, Eproto);
 		}
 

sys/src/cmd/fax/file.c

@@ -151,7 +151,7 @@ picopen(Modem *m)
 		}
 	}
 
-	verbose("openfaxfile: valid #%4.4ux", m->valid);
+	verbose("openfaxfile: valid #%4.4x", m->valid);
 	if((m->valid & (Vtype|Vwd)) != (Vtype|Vwd)){
 		Bterm(m->bp);
 		return seterror(m, Eproto);

sys/src/cmd/fossil/cache.c

@@ -465,11 +465,11 @@ _cacheLocalLookup(Cache *c, int part, uint32_t addr, uint32_t vers,
 			break;
 		case BioVentiError:
 			blockPut(b);
-			vtSetError("venti i/o error block 0x%.8ux", addr);
+			vtSetError("venti i/o error block 0x%.8x", addr);
 			return nil;
 		case BioReadError:
 			blockPut(b);
-			vtSetError("error reading block 0x%.8ux", addr);
+			vtSetError("error reading block 0x%.8x", addr);
 			return nil;
 		}
 	}
@@ -589,7 +589,7 @@ fprint(2, "%s: _cacheLocal want epoch %u got %u\n", argv0, epoch, b->l.epoch);
 		case BioReadError:
 			blockSetIOState(b, BioEmpty);
 			blockPut(b);
-			vtSetError("error reading block 0x%.8ux", addr);
+			vtSetError("error reading block 0x%.8x", addr);
 			return nil;
 		}
 	}
@@ -1766,10 +1766,10 @@ scoreFmt(Fmt *f)
 	if(v == nil){
 		fmtprint(f, "*");
 	}else if((addr = globalToLocal(v)) != NilBlock)
-		fmtprint(f, "0x%.8ux", addr);
+		fmtprint(f, "0x%.8x", addr);
 	else{
 		for(i = 0; i < VtScoreSize; i++)
-			fmtprint(f, "%2.2ux", v[i]);
+			fmtprint(f, "%2.2x", v[i]);
 	}
 
 	return 0;

sys/src/cmd/fossil/flfmt9660.c

@@ -78,7 +78,7 @@ dumpbootvol(void *a)
 	Voldesc *v;
 
 	v = a;
-	print("magic %.2ux %.5s %.2ux %2ux\n",
+	print("magic %.2x %.5s %.2x %2ux\n",
 		v->magic[0], v->magic+1, v->magic[6], v->magic[7]);
 	if(v->magic[0] == 0xFF)
 		return;
@@ -86,7 +86,7 @@ dumpbootvol(void *a)
 	print("system %.32T\n", v->systemid);
 	print("volume %.32T\n", v->volumeid);
 	print("volume size %.4N\n", v->volsize);
-	print("charset %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux\n",
+	print("charset %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x\n",
 		v->charset[0], v->charset[1], v->charset[2], v->charset[3],
 		v->charset[4], v->charset[5], v->charset[6], v->charset[7]);
 	print("volume set size %.2N\n", v->volsetsize);

sys/src/cmd/fossil/pack.c

@@ -85,8 +85,8 @@ labelUnpack(Label *l, uint8_t *p, int i)
 	if(l->type > BtMax){
 Bad:
 		vtSetError(EBadLabel);
-		fprint(2, "%s: labelUnpack: bad label: 0x%.2ux 0x%.2ux 0x%.8ux "
-			"0x%.8ux 0x%.8ux\n", argv0, l->state, l->type, l->epoch,
+		fprint(2, "%s: labelUnpack: bad label: 0x%.2x 0x%.2x 0x%.8x "
+			"0x%.8x 0x%.8x\n", argv0, l->state, l->type, l->epoch,
 			l->epochClose, l->tag);
 		return 0;
 	}

sys/src/cmd/fossil/view.c

@@ -177,7 +177,7 @@ readBlock(int part, uint32_t addr)
 	start = partStart(part);
 	end = partEnd(part);
 	if(addr >= end-start){
-		werrstr("bad addr 0x%.8ux; wanted 0x%.8ux - 0x%.8ux", addr, start, end);
+		werrstr("bad addr 0x%.8x; wanted 0x%.8x - 0x%.8x", addr, start, end);
 		return nil;
 	}
 
@@ -275,7 +275,7 @@ dataBlock(uint8_t score[VtScoreSize], uint type, uint tag)
 		return nil;
 	}
 	if(tag && l.tag != tag){
-		werrstr("tag mismatch; got 0x%.8ux wanted 0x%.8ux",
+		werrstr("tag mismatch; got 0x%.8x wanted 0x%.8x",
 			l.tag, tag);
 		return nil;
 	}
@@ -840,10 +840,10 @@ scoreFmt(Fmt *f)
 	if(v == nil){
 		fmtprint(f, "*");
 	}else if((addr = globalToLocal(v)) != NilBlock)
-		fmtprint(f, "0x%.8ux", addr);
+		fmtprint(f, "0x%.8x", addr);
 	else{
 		for(i = 0; i < VtScoreSize; i++)
-			fmtprint(f, "%2.2ux", v[i]);
+			fmtprint(f, "%2.2x", v[i]);
 	}
 
 	return 0;

sys/src/cmd/import.c

@@ -441,6 +441,6 @@ filter(int fd, char *cmd, char *host)
 static void
 mksecret(char *t, uint8_t *f)
 {
-	sprint(t, "%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux%2.2ux",
+	sprint(t, "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		f[0], f[1], f[2], f[3], f[4], f[5], f[6], f[7], f[8], f[9]);
 }

sys/src/cmd/ip/dhcpd/dhcpd.c

@@ -394,7 +394,7 @@ proto(Req *rp, int n)
 			warning(0, "no chaddr");
 			return;
 		}
-		sprint(buf, "hwa%2.2ux_", rp->bp->htype);
+		sprint(buf, "hwa%2.2x_", rp->bp->htype);
 		rp->id = tohex(buf, rp->bp->chaddr, rp->bp->hlen);
 	}
 

sys/src/cmd/ip/ipconfig/ipv6.c

@@ -288,10 +288,10 @@ pkt2str(uint8_t *ps, uint8_t *pe, char *sps, char *spe)
 
 	tn = icmpmsg6[h->type];
 	if(tn == nil)
-		p = seprint(p, e, "t=%u c=%d ck=%4.4ux", h->type,
+		p = seprint(p, e, "t=%u c=%d ck=%4.4x", h->type,
 			h->code, (uint16_t)NetS(h->cksum));
 	else
-		p = seprint(p, e, "t=%s c=%d ck=%4.4ux", tn,
+		p = seprint(p, e, "t=%s c=%d ck=%4.4x", tn,
 			h->code, (uint16_t)NetS(h->cksum));
 
 	switch(h->type){

sys/src/cmd/ip/pppoe.c

@@ -612,7 +612,7 @@ dumptags(uint8_t *tagdat, int ntagdat)
 			fprint(2, "nonce ");
 		Hex:
 			for(i=0; i<len; i++)
-				fprint(2, "%.2ux", v[i]);
+				fprint(2, "%.2x", v[i]);
 			fprint(2, "\n");
 			break;
 		case TagAcCookie:
@@ -693,7 +693,7 @@ hexdump(uint8_t *a, int na)
 
 	buf[0] = '\0';
 	for(i=0; i<na; i++){
-		sprint(buf+strlen(buf), " %.2ux", a[i]);
+		sprint(buf+strlen(buf), " %.2x", a[i]);
 		if(i%16 == 7)
 			sprint(buf+strlen(buf), " --");
 		if(i%16==15){

sys/src/cmd/ip/pptp.c

@@ -716,7 +716,7 @@ thread(void(*f)(void*), void *a)
 void
 dumpctlpkt(uint8_t *pkt)
 {
-	fprint(2, "pkt len %d mtype %d cookie 0x%.8ux type %d\n",
+	fprint(2, "pkt len %d mtype %d cookie 0x%.8x type %d\n",
 		nhgets(pkt), nhgets(pkt+2),
 		nhgetl(pkt+4), nhgets(pkt+8));
 
@@ -751,11 +751,11 @@ dumpctlpkt(uint8_t *pkt)
 		break;
 
 	case Techo:
-		fprint(2, "\tTecho id %.8ux\n", nhgetl(pkt+12));
+		fprint(2, "\tTecho id %.8x\n", nhgetl(pkt+12));
 		break;
 
 	case Recho:
-		fprint(2, "\tRecho id %.8ux res %d err %d\n", nhgetl(pkt+12), pkt[16], pkt[17]);
+		fprint(2, "\tRecho id %.8x res %d err %d\n", nhgetl(pkt+12), pkt[16], pkt[17]);
 		break;
 
 	case Tcallout:
@@ -774,7 +774,7 @@ dumpctlpkt(uint8_t *pkt)
 		fprint(2, "\tRcallout id %d peerid %d res %d err %d cause %d\n",
 			nhgets(pkt+12), nhgets(pkt+14),
 			pkt[16], pkt[17], nhgets(pkt+18));
-		fprint(2, "\tconnect %d recvwin %d delay %d chan 0x%.8ux\n",
+		fprint(2, "\tconnect %d recvwin %d delay %d chan 0x%.8x\n",
 			nhgetl(pkt+20), nhgets(pkt+24),
 			nhgets(pkt+26), nhgetl(pkt+28));
 		break;

sys/src/cmd/ip/snoopy/bootp.c

@@ -161,7 +161,7 @@ p_seprint(Msg *m)
 		demux(p_mux, x, x, m, &dump);
 	}
 
-	m->p = seprint(m->p, m->e, "t=%s ht=%d hl=%d hp=%d xid=%x sec=%d fl=%4.4ux ca=%V ya=%V sa=%V ga=%V cha=%E magic=%lx",
+	m->p = seprint(m->p, m->e, "t=%s ht=%d hl=%d hp=%d xid=%x sec=%d fl=%4.4x ca=%V ya=%V sa=%V ga=%V cha=%E magic=%lx",
 		op(h->op), h->htype, h->hlen, h->hops,
 		NetL(h->xid), NetS(h->secs), NetS(h->flags),
 		h->ciaddr, h->yiaddr, h->siaddr, h->giaddr, h->chaddr,

sys/src/cmd/ip/snoopy/ether.c

@@ -117,7 +117,7 @@ p_seprint(Msg *m)
 	t = NetS(h->type);
 	demux(p_mux, t, t, m, &dump);
 
-	m->p = seprint(m->p, m->e, "s=%E d=%E pr=%4.4ux ln=%d", h->s, h->d,
+	m->p = seprint(m->p, m->e, "s=%E d=%E pr=%4.4x ln=%d", h->s, h->d,
 		t, len);
 	return 0;
 }

sys/src/cmd/ip/snoopy/hdlc.c

@@ -164,7 +164,7 @@ p_framer(int fd, uint8_t *pkt, int pktlen)
 
 		/* accept if this is a good packet */
 		if(fcs != PPP_goodfcs)
-			print("bad frame %ld %2.2ux %2.2ux!\n", to-pkt, pkt[0], pkt[1]);
+			print("bad frame %ld %2.2x %2.2x!\n", to-pkt, pkt[0], pkt[1]);
 		else
 			return to-pkt;
 	}

sys/src/cmd/ip/snoopy/icmp.c

@@ -141,10 +141,10 @@ p_seprint(Msg *m)
 
 	tn = icmpmsg[h->type];
 	if(tn == nil)
-		p = seprint(p, e, "t=%u c=%d ck=%4.4ux", h->type,
+		p = seprint(p, e, "t=%u c=%d ck=%4.4x", h->type,
 			h->code, (uint16_t)NetS(h->cksum));
 	else
-		p = seprint(p, e, "t=%s c=%d ck=%4.4ux", tn,
+		p = seprint(p, e, "t=%s c=%d ck=%4.4x", tn,
 			h->code, (uint16_t)NetS(h->cksum));
 	if(Cflag){
 		cksum = NetS(h->cksum);
@@ -152,7 +152,7 @@ p_seprint(Msg *m)
 		h->cksum[1] = 0;
 		cksum2 = ~ptclbsum((uint8_t*)h, m->pe - m->ps + ICMPLEN) & 0xffff;
 		if(cksum != cksum2)
-			p = seprint(p,e, " !ck=%4.4ux", cksum2);
+			p = seprint(p,e, " !ck=%4.4x", cksum2);
 	}
 	switch(h->type){
 	case EchoRep:
@@ -186,7 +186,7 @@ p_seprint(Msg *m)
 	case ParamProb:
 		m->ps += 4;
 		m->pr = &ip;
-		p = seprint(p, e, "ptr=%2.2ux", h->data[0]);
+		p = seprint(p, e, "ptr=%2.2x", h->data[0]);
 		break;
 	}
 	m->p = p;

sys/src/cmd/ip/snoopy/icmp6.c

@@ -306,10 +306,10 @@ p_seprint(Msg *m)
 
 	tn = icmpmsg6[h->type];
 	if(tn == nil)
-		p = seprint(p, e, "t=%u c=%d ck=%4.4ux", h->type,
+		p = seprint(p, e, "t=%u c=%d ck=%4.4x", h->type,
 			h->code, (uint16_t)NetS(h->cksum));
 	else
-		p = seprint(p, e, "t=%s c=%d ck=%4.4ux", tn,
+		p = seprint(p, e, "t=%s c=%d ck=%4.4x", tn,
 			h->code, (uint16_t)NetS(h->cksum));
 
 /*
@@ -319,7 +319,7 @@ p_seprint(Msg *m)
 		h->cksum[1] = 0;
 		cksum2 = ~ptclbsum((uchar*)h, m->pe - m->ps + ICMP6LEN) & 0xffff;
 		if(cksum != cksum2)
-			p = seprint(p,e, " !ck=%4.4ux", cksum2);
+			p = seprint(p,e, " !ck=%4.4x", cksum2);
 	}
  */
 
@@ -360,7 +360,7 @@ p_seprint(Msg *m)
 			i = nelem(parpcode)-1;
 		else
 			i = h->code;
-		p = seprint(p, e, " code=%s ptr=%2.2ux", parpcode[i], h->data[0]);
+		p = seprint(p, e, " code=%s ptr=%2.2x", parpcode[i], h->data[0]);
 		break;
 
 	case EchoReplyV6:

sys/src/cmd/ip/snoopy/il.c

@@ -135,7 +135,7 @@ p_seprint(Msg *m)
 	sport = NetS(h->sport);
 	demux(p_mux, sport, dport, m, &dump);
 
-	m->p = seprint(m->p, m->e, "s=%d d=%d t=%s id=%lu ack=%lu spec=%d ck=%4.4ux ln=%d",
+	m->p = seprint(m->p, m->e, "s=%d d=%d t=%s id=%lu ack=%lu spec=%d ck=%4.4x ln=%d",
 			sport, dport, pkttype(h->type),
 			(uint32_t)NetL(h->id), (uint32_t)NetL(h->ack),
 			h->spec,

sys/src/cmd/ip/snoopy/ip.c

@@ -222,7 +222,7 @@ p_seprint(Msg *m)
 	/* next header */
 	hl = (h->vihl  &0xf) << 2;
 
-	m->p = seprint(m->p, m->e, "s=%V d=%V id=%4.4ux frag=%4.4ux ttl=%3d pr=%d ln=%d hl=%d",
+	m->p = seprint(m->p, m->e, "s=%V d=%V id=%4.4x frag=%4.4x ttl=%3d pr=%d ln=%d hl=%d",
 		h->src, h->dst, NetS(h->id), NetS(h->frag), h->ttl, h->proto,
 		NetS(h->length),
 		(h->vihl & 0xf) << 2);
@@ -232,7 +232,7 @@ p_seprint(Msg *m)
 	if(p < m->ps){
 		m->p = seprint(m->p, m->e, " opts=(");
 		while(p < m->ps)
-			m->p = seprint(m->p, m->e, "%.2ux", *p++);
+			m->p = seprint(m->p, m->e, "%.2x", *p++);
 		m->p = seprint(m->p, m->e, ")");
 	}
 

sys/src/cmd/ip/snoopy/ospf.c

@@ -71,7 +71,7 @@ ospfauth(Ospfpkt *ospf)
 	case 0:
 		return "no authentication";
 	case 1:
-		sprint(auth, "password(%8.8ux %8.8ux)", NetL(ospf->auth),	
+		sprint(auth, "password(%8.8x %8.8x)", NetL(ospf->auth),	
 			NetL(ospf->auth+4));
 		break;
 	case 2:
@@ -79,7 +79,7 @@ ospfauth(Ospfpkt *ospf)
 			ospf->auth[2], ospf->auth[3]);
 		break;
 	default:
-		sprint(auth, "auth%d(%8.8ux %8.8ux)", NetS(ospf->autype), NetL(ospf->auth),	
+		sprint(auth, "auth%d(%8.8x %8.8x)", NetS(ospf->autype), NetL(ospf->auth),	
 			NetL(ospf->auth+4));
 	}
 	return auth;
@@ -220,7 +220,7 @@ struct OspfLSupdpkt {
 char*
 seprintospflsaheader(char *p, char *e, struct OspfLSAhdr *h)
 {
-	return seprint(p, e, "age %d opt %x type %x lsid %V adv_rt %V seqno %x c %4.4ux l %d",
+	return seprint(p, e, "age %d opt %x type %x lsid %V adv_rt %V seqno %x c %4.4x l %d",
 		NetS(h->lsage), h->options&0xff, h->lstype,
 		h->lsid, h->advtrt, NetL(h->lsseqno), NetS(h->lscksum),
 		NetS(h->lsalen));
@@ -305,7 +305,7 @@ seprintospflsupdate(char *p, char *e, void *a, int len)
 				h = &(g->as[i]);
 				p = seprint(p, e, " lsa%d(", i);
 				p = seprintospflsaheader(p, e, &(h->hdr));
-				p = seprint(p, e, " mask %V extflg %1.1ux met %d fwdaddr %V extrtflg %x)",
+				p = seprint(p, e, " mask %V extflg %1.1x met %d fwdaddr %V extrtflg %x)",
 					h->netmask, h->lsa.flag, Net3(h->lsa.metric),
 					h->lsa.fwdaddr, NetL(h->lsa.exrttag));
 			}
@@ -356,7 +356,7 @@ p_seprint(Msg *m)
 		return -1;
 	x -= OSPF_HDRSIZE;
 
-	p = seprint(p, e, "ver=%d type=%d len=%d r=%V a=%V c=%4.4ux %s ",
+	p = seprint(p, e, "ver=%d type=%d len=%d r=%V a=%V c=%4.4x %s ",
 		ospf->version, ospf->type, x, 
 		ospf->router, ospf->area, NetS(ospf->sum),
 		ospfauth(ospf));

sys/src/cmd/ip/snoopy/ppp.c

@@ -295,7 +295,7 @@ seprintlcpopt(char *p, char *e, void *a, int len)
 				p = seprint(p, e, " auth=passwd");
 				break;
 			case PPP_chap:
-				p = seprint(p, e, " (auth=chap data=%2.2ux)", o->data[2]);
+				p = seprint(p, e, " (auth=chap data=%2.2x)", o->data[2]);
 				break;
 			}
 			break;
@@ -482,7 +482,7 @@ seprintccpopt(char *p, char *e, void *a, int len)
 			p = seprint(p, e, " type=%d ", o->type);
 			break;
 		case 0:
-			p = seprint(p, e, " OUI=(%d %.2ux%.2ux%.2ux) ", o->type, 
+			p = seprint(p, e, " OUI=(%d %.2x%.2x%.2x) ", o->type, 
 				o->data[0], o->data[1], o->data[2]);
 			break;
 		case 17:
@@ -565,7 +565,7 @@ p_seprintcomp(Msg *m)
 	if(x & (1<<12))
 		compflag[i++] = 'e';
 	compflag[i] = 0;
-	m->p = seprint(m->p, m->e, "flag=%s count=%.3ux", compflag, x&0xfff);
+	m->p = seprint(m->p, m->e, "flag=%s count=%.3x", compflag, x&0xfff);
 	m->p = seprint(m->p, m->e, " data=%.*H", len>64?64:len, m->ps);
 	m->pr = nil;
 	return 0;

sys/src/cmd/ip/snoopy/tcp.c

@@ -175,7 +175,7 @@ p_seprint(Msg *m)
 	sport = NetS(h->sport);
 	demux(p_mux, sport, dport, m, &dump);
 
-	m->p = seprint(m->p, m->e, "s=%d d=%d seq=%lu ack=%lu fl=%s win=%d ck=%4.4ux",
+	m->p = seprint(m->p, m->e, "s=%d d=%d seq=%lu ack=%lu fl=%s win=%d ck=%4.4x",
 			NetS(h->sport), dport,
 			(uint32_t)NetL(h->seq), (uint32_t)NetL(h->ack),
 			flags(flag), NetS(h->win),

sys/src/cmd/ip/snoopy/udp.c

@@ -123,7 +123,7 @@ p_seprint(Msg *m)
 	demux(p_mux, sport, dport, m, defproto);
 	defproto = &dump;
 
-	m->p = seprint(m->p, m->e, "s=%d d=%d ck=%4.4ux ln=%4d",
+	m->p = seprint(m->p, m->e, "s=%d d=%d ck=%4.4x ln=%4d",
 			NetS(h->sport), dport,
 			NetS(h->cksum), NetS(h->len));
 	return 0;

sys/src/cmd/ls.c

@@ -230,7 +230,7 @@ format(Dir *db, char *name)
 			Bprint(&bin, " ");
 	}
 	if(qflag)
-		Bprint(&bin, "(%.16llux %*lud %.2ux) ",
+		Bprint(&bin, "(%.16llux %*lud %.2x) ",
 			db->qid.path,
 			qwidth, db->qid.vers,
 			db->qid.type);

sys/src/cmd/md5sum.c

@@ -23,7 +23,7 @@ digestfmt(Fmt *fmt)
 
 	p = va_arg(fmt->args, uint8_t*);
 	for(i=0; i<MD5dlen; i++)
-		sprint(buf+2*i, "%.2ux", p[i]);
+		sprint(buf+2*i, "%.2x", p[i]);
 	return fmtstrcpy(fmt, buf);
 }
 

sys/src/cmd/paqfs/paqfs.c

@@ -164,7 +164,7 @@ sha1fmt(Fmt *f)
 	}
 	else{
 		for(i = 0; i < SHA1dlen; i++)
-			fmtprint(f, "%2.2ux", v[i]);
+			fmtprint(f, "%2.2x", v[i]);
 	}
 
 	return 0;
@@ -964,7 +964,7 @@ blockRead(uint8_t *data, uint32_t addr, int type)
 	}
 	getBlock(buf, &b);
 	if(b.magic != BlockMagic || b.size > blocksize || b.type != type){
-		fprint(2, "paqfs: bad block: magic %.8lux (want %.8ux) size %lu (max %d) type %u (want %u)\n",
+		fprint(2, "paqfs: bad block: magic %.8lux (want %.8x) size %lu (max %d) type %u (want %u)\n",
 			b.magic, BlockMagic, b.size, blocksize, b.type, type);
 		return 0;
 	}

sys/src/cmd/scuzz/sense.c

@@ -48,6 +48,6 @@ makesense(ScsiReq *rp)
 		Bprint(&bout, ": %s", s);
 	Bprint(&bout, "\n\t");
 	for(i = 0; i < 8+rp->sense[7]; i++)
-		Bprint(&bout, " %2.2ux", rp->sense[i]);
+		Bprint(&bout, " %2.2x", rp->sense[i]);
 	Bprint(&bout, "\n");
 }

sys/src/cmd/sha1sum.c

@@ -44,7 +44,7 @@ digestfmt(Fmt *fmt)
 
 	p = va_arg(fmt->args, uint8_t*);
 	for(i = 0; i < shadlen; i++)
-		sprint(buf + 2*i, "%.2ux", p[i]);
+		sprint(buf + 2*i, "%.2x", p[i]);
 	return fmtstrcpy(fmt, buf);
 }
 

sys/src/cmd/snap/read.c

@@ -90,7 +90,7 @@ Breadnumber(Biobuf *b, char *buf)
 				break;
 			}
 		}else{
-			werrstr("bad character %.2ux", c);
+			werrstr("bad character %.2x", c);
 			return -1;
 		}
 	}

sys/src/cmd/ssh1/scp.c

@@ -645,7 +645,7 @@ getresponse(void)
 
 	i = 0;
 	if(first > FATAL){
-		fprint(2, "scp: unexpected response character 0x%.2ux\n", first);
+		fprint(2, "scp: unexpected response character 0x%.2x\n", first);
 		buf[i++] = first;
 	}
 

sys/src/cmd/syscall/syscall.c

@@ -148,7 +148,7 @@ main(int argc, char *argv[])
 					if('!'<=c && c<='~')
 						print(" %c ", c);
 					else
-						print("%.2ux ", c);
+						print("%.2x ", c);
 					if(j%16 == 15)
 						print("\n");
 				}
@@ -160,7 +160,7 @@ main(int argc, char *argv[])
 					print("short stat message\n");
 				else{
 					print("[%s] ", d.muid);
-					print("(%.16llux %lu %.2ux) ", d.qid.path, d.qid.vers, d.qid.type);
+					print("(%.16llux %lu %.2x) ", d.qid.path, d.qid.vers, d.qid.type);
 					print("%M (%luo) ", d.mode, d.mode);
 					print("%c %d ", d.type, d.dev);
 					print("%s %s ", d.uid, d.gid);

sys/src/cmd/troff2html/troff2html.c

@@ -755,7 +755,7 @@ process(Biobuf *b, char *name)
 			vp = setnum(b, "vpos", 0, 10000);
 			break;
 		default:
-			fprint(2, "dhtml: unknown directive %c(0x%.2ux) at %s:#%d\n", c, c, filename, cno);
+			fprint(2, "dhtml: unknown directive %c(0x%.2x) at %s:#%d\n", c, c, filename, cno);
 			return;
 		}
 	}

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

@@ -200,7 +200,7 @@ checkbloom(Bloom *b1, Bloom *b2, int fix)
 	missing = 0;
 	for(i=BloomHeadSize/4; i<n; i++){
 		if(a1[i] != a2[i]){
-// print("%.8ux/%.8ux.", a1[i], a2[i]);
+// print("%.8x/%.8x.", a1[i], a2[i]);
 			extra   += countbits(a1[i] & ~a2[i]);
 			missing += countbits(a2[i] & ~a1[i]);
 		}