Browse Source

fmt: another round of format fixes for %#ul*x to remove the u

Remove the u.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 3 years ago
parent
commit
0f0d5bf7eb

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

@@ -1020,7 +1020,7 @@ scanphy(Ctlr* ctlr)
 		oui <<= 6;
 		x = miir(ctlr, i, 3);
 		oui |= x>>10;
-		//print("phy%d: oui %#ux reg1 %#ux\n", i, oui, miir(ctlr, i, 1));
+		//print("phy%d: oui %#x reg1 %#x\n", i, oui, miir(ctlr, i, 1));
 
 		ctlr->eeprom[6] = i;
 		if(oui == 0xAA00)

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

@@ -730,7 +730,7 @@ ahciwakeup(Aport *p)
 	p->sctl = 3*Aipm | 0*Aspd | Adet;
 	delay(1);
 	p->sctl &= ~7;
-//	iprint("ahci: wake %#ux -> %#ux\n", s, p->sstatus);
+//	iprint("ahci: wake %#x -> %#x\n", s, p->sstatus);
 }
 
 static int

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

@@ -209,7 +209,7 @@ actrap(Ureg *u)
 	case IdtPF:
 		/* this case is here for debug only */
 		m->pfault++;
-		DBG("actrap: cpu%d: PF cr2 %#ullx\n", machp()->machno, cr2get());
+		DBG("actrap: cpu%d: PF cr2 %#llx\n", machp()->machno, cr2get());
 		break;
 	default:
 		print("actrap: cpu%d: %llu\n", machp()->machno, u->type);

+ 2 - 2
sys/src/9/amd64/acore.c.old

@@ -311,7 +311,7 @@ kproc("testproc", testproc, up);
 		switch(rc){
 		case ICCTRAP:
 			m->cr2 = up->ac->cr2;
-			DBG("runacore: trap %llu cr2 %#ullx ureg %#p\n",
+			DBG("runacore: trap %llu cr2 %#llx ureg %#p\n",
 				ureg->type, m->cr2, ureg);
 			if(ureg->type == IdtIPI){
 				if(up->procctl || up->nnote)
@@ -323,7 +323,7 @@ kproc("testproc", testproc, up);
 			fn = actrapret;
 			break;
 		case ICCSYSCALL:
-			DBG("runacore: syscall ax %#ullx ureg %#p\n",
+			DBG("runacore: syscall ax %#llx ureg %#p\n",
 				ureg->ax, ureg);
 			syscall(ureg->ax, ureg);
 			flush = 1;

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

@@ -267,7 +267,7 @@ asmmapinit(uintmem addr, uintmem size, int type)
 void
 asmmodinit(uint32_t start, uint32_t end, char* s)
 {
-	DBG("asmmodinit: %#ux -> %#ux: <%s> %#ux\n",
+	DBG("asmmodinit: %#x -> %#x: <%s> %#x\n",
 		start, end, s, ROUNDUP(end, 4096));
 
 	if(start < sys->pmstart)

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

@@ -143,7 +143,7 @@ acpirsdptr(void)
 #if 0
 	assert(sizeof(Sdthdr) == 36);
 
-	DBG("acpi: RSD PTR@ %#p, physaddr %#ux length %u %#llux rev %d\n",
+	DBG("acpi: RSD PTR@ %#p, physaddr %#x length %u %#llux rev %d\n",
 		rsd, l32get(rsd->raddr), l32get(rsd->length),
 		l64get(rsd->xaddr), rsd->revision);
 

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

@@ -243,7 +243,7 @@ pmcread(Chan *c, void *a, int32_t n, int64_t offset)
 	switch(type){
 	case Qdata:
 		v = pmcgetctr(coreno, id);
-		snprint(s, PmcCtlRdStr, "%#ullx", v);
+		snprint(s, PmcCtlRdStr, "%#llx", v);
 		break;
 	case Qctl:
 		if (pmcgetctl(coreno, &p, id) < 0)

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

@@ -1163,7 +1163,7 @@ i82563rproc(void* arg)
 				passed++;
 			} else {
 				if (rd->status & Reop && rd->errors)
-					print("%s: input packet error %#ux\n",
+					print("%s: input packet error %#x\n",
 						tname[ctlr->type], rd->errors);
 				freeb(bp);
 			}

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

@@ -302,7 +302,7 @@ fpunote(void)
 		cm =  "Unknown";
 
 	snprint(up->genbuf, sizeof(up->genbuf),
-		"sys: fp: %s Exception ipo=%#llux fsw=%#ux",
+		"sys: fp: %s Exception ipo=%#llux fsw=%#x",
 		cm, fpusave->rip, fsw);
 	return up->genbuf;
 }
@@ -353,7 +353,7 @@ xfpuxf(Ureg* ureg, void* v)
 		cm =  "Unknown";
 
 	snprint(up->genbuf, sizeof(up->genbuf),
-		"sys: fp: %s Exception mxcsr=%#ux", cm, mxcsr);
+		"sys: fp: %s Exception mxcsr=%#x", cm, mxcsr);
 	return up->genbuf;
 }
 

+ 2 - 2
sys/src/9/amd64/fpu.c.old

@@ -275,7 +275,7 @@ fpupostnote(void)
 	else
 		m =  "Unknown";
 
-	snprint(n, sizeof(n), "sys: fp: %s Exception ipo=%#llux fsw=%#ux",
+	snprint(n, sizeof(n), "sys: fp: %s Exception ipo=%#llux fsw=%#x",
 		m, fpusave->rip, fsw);
 	postnote(up, 1, n, NDebug);
 }
@@ -324,7 +324,7 @@ fpuxf(Ureg* ureg, void*)
 	else
 		m =  "Unknown";
 
-	snprint(n, sizeof(n), "sys: fp: %s Exception mxcsr=%#ux", m, mxcsr);
+	snprint(n, sizeof(n), "sys: fp: %s Exception mxcsr=%#x", m, mxcsr);
 	postnote(up, 1, n, NDebug);
 }
 

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

@@ -408,7 +408,7 @@ physallocdump(void)
 
 	for(n = 0; n < Ndoms; n++)
 		if(bal[n].size > 0)
-			print("physalloc color=%d base=%#ullx size=%#ullx\n",
+			print("physalloc color=%d base=%#llx size=%#llx\n",
 				n, bal[n].base, bal[n].size);
 }
 
@@ -448,13 +448,13 @@ iimbchunk(Bal *b, uintmem a, uintmem e, int type)
 			a += s;
 		}
 	}
-	DBG("done1 a %#P e %#P s %#ux %d\n", a, e, s, k);
+	DBG("done1 a %#P e %#P s %#x %d\n", a, e, s, k);
 
 	while(a+s <= e){
 		plop(b, a, k, type);
 		a += s;
 	}
-	DBG("done2 a %#P e %#P s %#ux %d\n", a, e, s, k);
+	DBG("done2 a %#P e %#P s %#x %d\n", a, e, s, k);
 
 	for(k -= 1, s >>= 1; a < e; s >>= 1, k -= 1){
 		if(a+s <= e){
@@ -462,7 +462,7 @@ iimbchunk(Bal *b, uintmem a, uintmem e, int type)
 			a += s;
 		}
 	}
-	DBG("done3 a %#P e %#P s %#ux %d\n", a, e, s, k);
+	DBG("done3 a %#P e %#P s %#x %d\n", a, e, s, k);
 
 	return 0;
 }
@@ -478,7 +478,7 @@ physinit(uintmem a, uint64_t size)
 	int i, dom;
 	uintmem addr, len;
 
-	DBG("physinit %#ullx %#ullx\n", a, size);
+	DBG("physinit %#llx %#llx\n", a, size);
 
 	for(addr = a; addr < a+size; addr += len){
 		dom = 0;
@@ -494,7 +494,7 @@ physinit(uintmem a, uint64_t size)
 		 * This code assumes that a domain may be extended later and
 		 * that there is no interleaving of domains. Ok by now.
 		 */
-		DBG("physmem block dom %d addr %#ullx size %#ullx\n",
+		DBG("physmem block dom %d addr %#llx size %#llx\n",
 			dom, addr, len);
 		if(dom < 0 || dom >= Ndoms){
 			print("physinit: invalid dom %d\n", dom);

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

@@ -113,7 +113,7 @@ getctl(PmcCtl *p, uint32_t regno)
 	e = GetEvMsk(r);
 	u = GetUMsk(r);
 	//TODO inverse translation
-	snprint(p->descstr, KNAMELEN, "%#ullx %#ullx", e, u);
+	snprint(p->descstr, KNAMELEN, "%#llx %#llx", e, u);
 	p->nodesc = 0;
 	return 0;
 }

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

@@ -67,7 +67,7 @@ sipi(void)
 		p = alloc+MACHSTKSZ;
 
 		sipiptr[-1] = mmuphysaddr(PTR2UINT(p));
-		DBG("p %#p sipiptr[-1] %#ux\n", p, sipiptr[-1]);
+		DBG("p %#p sipiptr[-1] %#x\n", p, sipiptr[-1]);
 
 		p += 4*PTSZ+4*KiB;
 

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

@@ -260,7 +260,7 @@ runacore(void)
 		case ICCTRAP:
 			s = splhi();
 			machp()->MMU.cr2 = up->ac->MMU.cr2;
-			DBG("runacore: trap %llu cr2 %#ullx ureg %#p\n",
+			DBG("runacore: trap %llu cr2 %#llx ureg %#p\n",
 				ureg->type, machp()->MMU.cr2, ureg);
 			switch(ureg->type){
 			case IdtIPI:
@@ -299,7 +299,7 @@ runacore(void)
 			fn = actrapret;
 			break;
 		case ICCSYSCALL:
-			DBG("runacore: syscall ax %#ullx ureg %#p\n",
+			DBG("runacore: syscall ax %#llx ureg %#p\n",
 				ureg->ax, ureg);
 			cr3put(machp()->MMU.pml4->pa);
 			//syscall(ureg->ax, ureg);

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

@@ -180,7 +180,7 @@ scanpci(void)
 			continue;
 		}
 		//if(0 && p->vid == Vintel && p->did == 0x3b34) {
-		//	print("usbehci: ignoring known bad ctlr %#ux/%#ux\n",
+		//	print("usbehci: ignoring known bad ctlr %#x/%#x\n",
 		//		p->vid, p->did);
 		//	continue;
 		//}

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

@@ -839,7 +839,7 @@ seprinttd(char *s, char *e, Td *td, int iso)
 	if(td == nil)
 		return seprint(s, e, "<nil td>\n");
 	s = seprint(s, e, "%#p ep %#p ctrl %#p", td, td->ep, td->ctrl);
-	s = seprint(s, e, " cc=%#ulx", (td->ctrl >> Tdccshift) & Tdccmask);
+	s = seprint(s, e, " cc=%#lx", (td->ctrl >> Tdccshift) & Tdccmask);
 	if(iso == 0){
 		if((td->ctrl & Tdround) != 0)
 			s = seprint(s, e, " rnd");

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

@@ -2157,7 +2157,7 @@ tcpiput(Proto *tcp, Ipifc *ipifc, Block *bp)
 			tpriv->stats[CsumErrs]++;
 			tpriv->stats[InErrs]++;
 			netlog(f, Logtcp,
-			    "bad tcpv6 proto cksum: got %#ux, computed %#ux\n",
+			    "bad tcpv6 proto cksum: got %#x, computed %#x\n",
 				h6->tcpcksum[0]<<8 | h6->tcpcksum[1], csum);
 			freeblist(bp);
 			return;
@@ -3092,7 +3092,7 @@ logreseq(Fs *f, Reseq *r, uint32_t n)
 		else if(r->seg.seq != n)
 			s = "hole";
 		if(s != nil)
-			netlog(f, Logtcp, "%s %lu-%lu (%ld) %#ux\n", s,
+			netlog(f, Logtcp, "%s %lu-%lu (%ld) %#x\n", s,
 				n, r->seg.seq, r->seg.seq - n, r->seg.flags);
 		n = r->seg.seq + r->seg.len;
 	}

+ 3 - 3
sys/src/9/port/devsegment.c

@@ -361,7 +361,7 @@ segmentcreate(Chan *c, char *name, int omode, int perm)
 	c->mode = openmode(omode);
 	c->mode = OWRITE;
 
-	DBG("segmentcreate(%s, %#o %#ux)\n", name, omode, perm);
+	DBG("segmentcreate(%s, %#o %#x)\n", name, omode, perm);
 }
 
 enum{PTRSIZE = 19};	/* "0x1234567812345678 " */
@@ -370,7 +370,7 @@ readptr(char *buf, int32_t n, uintptr_t val)
 {
 	if(n < PTRSIZE)
 		return 0;
-	snprint(buf, sizeof buf, "%*#ullx", PTRSIZE-1, val);
+	snprint(buf, sizeof buf, "%*#llx", PTRSIZE-1, val);
 	buf[PTRSIZE-1] = ' ';
 	return PTRSIZE;
 }
@@ -544,7 +544,7 @@ segmentwrite(Chan *c, void *a, int32_t n, int64_t voff)
 				newzmap(g->s);
 			else if(i == 1)
 				zgrow(g->s);
-			DBG("newseg %s base %#ullx len %#ullx\n",
+			DBG("newseg %s base %#llx len %#llx\n",
 				cb->f[0], va, len*BIGPGSZ);
 			if(i == 0 || i == 1)
 				dumpzseg(g->s);

+ 5 - 5
sys/src/9/port/page.c

@@ -79,7 +79,7 @@ pageinit(void)
 				DBG("pageinit: pgalloc failed. breaking.\n");
 				break;	/* don't consume more memory */
 			}
-			DBG("pageinit: alloced pa %#P sz %#ux color %d\n",
+			DBG("pageinit: alloced pa %#P sz %#x color %d\n",
 				pg->pa, sys->pgsz[si], pg->color);
 			lock(&pga.l);
 			pg->ref = 0;
@@ -99,7 +99,7 @@ getpgszi(usize size)
 	for(si = 0; si < sys->npgsz; si++)
 		if(size == sys->pgsz[si])
 			return si;
-	print("getpgszi: size %#ulx not found\n", size);
+	print("getpgszi: size %#lx not found\n", size);
 	return -1;
 }
 
@@ -116,7 +116,7 @@ pgalloc(usize size, int color)
 	}
 	memset(pg, 0, sizeof *pg);
 	if((pg->pa = physalloc(size, &color, pg)) == 0){
-		DBG("pgalloc: physalloc failed: size %#ulx color %d\n", size, color);
+		DBG("pgalloc: physalloc failed: size %#lx color %d\n", size, color);
 		free(pg);
 		return nil;
 	}
@@ -288,7 +288,7 @@ newpage(int clear, Segment **s, uintptr_t va, usize size, int color)
 
 	lock(&p->l);
 	if(p->ref != 0)
-		panic("newpage pa %#ullx", p->pa);
+		panic("newpage pa %#llx", p->pa);
 
 	uncachepage(p);
 	p->ref++;
@@ -318,7 +318,7 @@ if (VA(k) == 0xfffffe007d800000ULL) trip++;
 //if (trip) die("trip");
 		kunmap(k);
 	}
-	DBG("newpage: va %#p pa %#ullx pgsz %#ux color %d\n",
+	DBG("newpage: va %#p pa %#llx pgsz %#x color %d\n",
 		p->va, p->pa, sys->pgsz[p->pgszi], p->color);
 
 	return p;

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

@@ -214,7 +214,7 @@ freepages(int si, int once)
 			pageunchain(p);
 			unlock(&pga.l);
 			if(p->ref != 0)
-				panic("freepages pa %#ullx", p->pa);
+				panic("freepages pa %#llx", p->pa);
 			pgfree(p);
 			if(once)
 				break;

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

@@ -69,7 +69,7 @@ ziofmt(Fmt *f)
 	Kzio *io;
 
 	io = va_arg(f->args, Kzio*);
-	return fmtprint(f, "%#p[%#ulx]", io->Zio.data, io->Zio.size);
+	return fmtprint(f, "%#p[%#lx]", io->Zio.data, io->Zio.size);
 }
 
 static void

+ 1 - 1
sys/src/9/test/1/main.c

@@ -302,7 +302,7 @@ main(uint32_t ax, uint32_t bx)
 	fmtinit();
 	print("\nNIX\n");
 	if(vflag){
-		print("&ax = %#p, ax = %#ux, bx = %#ux\n", &ax, ax, bx);
+		print("&ax = %#p, ax = %#x, bx = %#x\n", &ax, ax, bx);
 		multiboot(ax, bx, vflag);
 	}
 

+ 1 - 1
sys/src/cmd/aux/vga/nvidia.c

@@ -218,7 +218,7 @@ snarf(Vga* vga, Ctlr* ctlr)
 			nv->arch = 40;
 			break;
 		default:
-			error("%s: DID %#4.4ux - %#ux unsupported\n",
+			error("%s: DID %#4.4ux - %#x unsupported\n",
 				ctlr->name, nv->did, (nv->did & 0x0ff0));
 			break;
 		}

+ 1 - 1
sys/src/cmd/cdfs/mmc.c

@@ -804,7 +804,7 @@ notefeats(Drive *drive, uint8_t *p, uint32_t datalen)
 		len = 4 + p[3];
 		ftnm = featname(feat);
 		if (vflag && ftnm)
-			fprint(2, "%#ux (%s) curr %d\n", feat, ftnm, p[2] & 1);
+			fprint(2, "%#x (%s) curr %d\n", feat, ftnm, p[2] & 1);
 		if (feat >= Maxfeatures) {	/* could be vendor-specific */
 			if (vflag)
 				fprint(2, "feature %d too big for bit map\n",

+ 11 - 11
sys/src/cmd/fossil/archive.c

@@ -79,18 +79,18 @@ ventiSend(Arch *a, Block *b, uint8_t *data)
 	uint8_t score[VtScoreSize];
 
 	if(DEBUG > 1)
-		fprint(2, "ventiSend: sending %#ux %L to venti\n", b->addr, &b->l);
+		fprint(2, "ventiSend: sending %#x %L to venti\n", b->addr, &b->l);
 	n = vtZeroTruncate(vtType[b->l.type], data, a->blockSize);
 	if(DEBUG > 1)
 		fprint(2, "ventiSend: truncate %d to %d\n", a->blockSize, n);
 	if(!vtWrite(a->z, score, vtType[b->l.type], data, n)){
-		fprint(2, "ventiSend: vtWrite block %#ux failed: %R\n", b->addr);
+		fprint(2, "ventiSend: vtWrite block %#x failed: %R\n", b->addr);
 		return 0;
 	}
 	if(!vtSha1Check(score, data, n)){
 		uint8_t score2[VtScoreSize];
 		vtSha1(score2, data, n);
-		fprint(2, "ventiSend: vtWrite block %#ux failed vtSha1Check %V %V\n",
+		fprint(2, "ventiSend: vtWrite block %#x failed vtSha1Check %V %V\n",
 			b->addr, score, score2);
 		return 0;
 	}
@@ -199,7 +199,7 @@ archWalk(Param *p, uint32_t addr, uint8_t type, uint32_t tag)
 
 	b = cacheLocalData(p->c, addr, type, tag, OReadWrite,0);
 	if(b == nil){
-		fprint(2, "archive(%u, %#ux): cannot find block: %R\n", p->snapEpoch, addr);
+		fprint(2, "archive(%u, %#x): cannot find block: %R\n", p->snapEpoch, addr);
 		if(strcmp(vtGetError(), ELabelMismatch) == 0){
 			/* might as well plod on so we write _something_ to Venti */
 			memmove(p->score, vtZeroScore, VtScoreSize);
@@ -208,7 +208,7 @@ archWalk(Param *p, uint32_t addr, uint8_t type, uint32_t tag)
 		return ArchFailure;
 	}
 
-	if(DEBUG) fprint(2, "%*sarchive(%u, %#ux): block label %L\n",
+	if(DEBUG) fprint(2, "%*sarchive(%u, %#x): block label %L\n",
 		p->depth*2, "",  p->snapEpoch, b->addr, &b->l);
 	p->depth++;
 	if(p->depth > p->maxdepth)
@@ -223,7 +223,7 @@ archWalk(Param *p, uint32_t addr, uint8_t type, uint32_t tag)
 					continue;
 				if((e->snap && !e->archive)
 				|| (e->flags&VtEntryNoArchive)){
-					if(0) fprint(2, "snap; faking %#ux\n", b->addr);
+					if(0) fprint(2, "snap; faking %#x\n", b->addr);
 					if(data == b->data){
 						data = copyBlock(b, p->blockSize);
 						if(data == nil){
@@ -261,7 +261,7 @@ archWalk(Param *p, uint32_t addr, uint8_t type, uint32_t tag)
 				vtSleep(b->ioready);
 			switch(x){
 			case ArchFailure:
-				fprint(2, "archWalk %#ux failed; ptr is in %#ux offset %d\n",
+				fprint(2, "archWalk %#x failed; ptr is in %#x offset %d\n",
 					addr, b->addr, i);
 				ret = ArchFailure;
 				goto Out;
@@ -277,7 +277,7 @@ archWalk(Param *p, uint32_t addr, uint8_t type, uint32_t tag)
 				 */
 				if(e==nil || !e->archive)
 				if(data == b->data){
-if(0) fprint(2, "faked %#ux, faking %#ux (%V)\n", addr, b->addr, p->score);
+if(0) fprint(2, "faked %#x, faking %#x (%V)\n", addr, b->addr, p->score);
 					data = copyBlock(b, p->blockSize);
 					if(data == nil){
 						ret = ArchFailure;
@@ -407,7 +407,7 @@ sleep(10*1000);	/* window of opportunity to provoke races */
 		default:
 			abort();
 		case ArchFailure:
-			fprint(2, "archiveBlock %#ux: %R\n", addr);
+			fprint(2, "archiveBlock %#x: %R\n", addr);
 			sleep(60*1000);
 			continue;
 		case ArchSuccess:
@@ -415,7 +415,7 @@ sleep(10*1000);	/* window of opportunity to provoke races */
 			break;
 		}
 
-		if(0) fprint(2, "archiveSnapshot 0x%#ux: maxdepth %u nfixed %u"
+		if(0) fprint(2, "archiveSnapshot 0x%#x: maxdepth %u nfixed %u"
 			" send %u nfailsend %u nvisit %u"
 			" nreclaim %u nfake %u nreal %u\n",
 			addr, p.maxdepth, p.nfixed,
@@ -434,7 +434,7 @@ sleep(10*1000);	/* window of opportunity to provoke races */
 		vtRootPack(&root, rbuf);
 		if(!vtWrite(a->z, p.score, VtRootType, rbuf, VtRootSize)
 		|| !vtSha1Check(p.score, rbuf, VtRootSize)){
-			fprint(2, "vtWriteBlock %#ux: %R\n", addr);
+			fprint(2, "vtWriteBlock %#x: %R\n", addr);
 			sleep(60*1000);
 			continue;
 		}

+ 2 - 2
sys/src/cmd/fossil/cache.c

@@ -1412,7 +1412,7 @@ blockCopy(Block *b, uint32_t tag, uint32_t ehi, uint32_t elo)
 	Label l;
 
 	if((b->l.state&BsClosed) || b->l.epoch >= ehi)
-		fprint(2, "%s: blockCopy %#ux %L but fs is [%u,%u]\n",
+		fprint(2, "%s: blockCopy %#x %L but fs is [%u,%u]\n",
 			argv0, b->addr, &b->l, elo, ehi);
 
 	bb = cacheAllocBlock(b->c, b->l.type, tag, ehi, elo);
@@ -1751,7 +1751,7 @@ labelFmt(Fmt *f)
 	Label *l;
 
 	l = va_arg(f->args, Label*);
-	return fmtprint(f, "%s,%s,e=%u,%d,tag=%#ux",
+	return fmtprint(f, "%s,%s,e=%u,%d,tag=%#x",
 		btStr(l->type), bsStr(l->state), l->epoch, (int)l->epochClose, l->tag);
 }
 

+ 6 - 6
sys/src/cmd/fossil/check.c

@@ -215,7 +215,7 @@ walkEpoch(Fsck *chk, Block *b, uint8_t score[VtScoreSize], int type,
 	if(b){
 		/* (i) */
 		if(b->l.epoch < bb->l.epoch || bb->l.epochClose <= b->l.epoch){
-			error(chk, "walk: block %#ux [%u, %u) points at %#ux [%u, %u)",
+			error(chk, "walk: block %#x [%u, %u) points at %#x [%u, %u)",
 				b->addr, b->l.epoch, b->l.epochClose,
 				bb->addr, bb->l.epoch, bb->l.epochClose);
 			goto Exit;
@@ -224,7 +224,7 @@ walkEpoch(Fsck *chk, Block *b, uint8_t score[VtScoreSize], int type,
 		/* (ii) */
 		if(b->l.epoch == epoch && bb->l.epoch == epoch){
 			if(getBit(chk->emap, addr)){
-				error(chk, "walk: epoch join detected: addr %#ux %L",
+				error(chk, "walk: epoch join detected: addr %#x %L",
 					bb->addr, &bb->l);
 				goto Exit;
 			}
@@ -234,7 +234,7 @@ walkEpoch(Fsck *chk, Block *b, uint8_t score[VtScoreSize], int type,
 		/* (iii) */
 		if(!(b->l.state&BsCopied) && b->l.epoch == bb->l.epoch){
 			if(getBit(chk->xmap, addr)){
-				error(chk, "walk: copy join detected; addr %#ux %L",
+				error(chk, "walk: copy join detected; addr %#x %L",
 					bb->addr, &bb->l);
 				goto Exit;
 			}
@@ -249,17 +249,17 @@ walkEpoch(Fsck *chk, Block *b, uint8_t score[VtScoreSize], int type,
 		 * ``have seen active''
 		 */
 		if(getBit(chk->amap, addr)){
-			error(chk, "walk: active join detected: addr %#ux %L",
+			error(chk, "walk: active join detected: addr %#x %L",
 				bb->addr, &bb->l);
 			goto Exit;
 		}
 		if(bb->l.state&BsClosed)
-			error(chk, "walk: addr %#ux: block is in active tree but is closed",
+			error(chk, "walk: addr %#x: block is in active tree but is closed",
 				addr);
 	}else
 		if(!getBit(chk->amap, addr))
 			if(!(bb->l.state&BsClosed)){
-				// error(chk, "walk: addr %#ux: block is not in active tree, not closed (%d)",
+				// error(chk, "walk: addr %#x: block is not in active tree, not closed (%d)",
 				// addr, bb->l.epochClose);
 				chk->close(chk, bb, epoch+1);
 				chk->nclose++;

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

@@ -1774,7 +1774,7 @@ setEntry(Source *r, Entry *e)
 	Entry oe;
 
 	b = cacheGlobal(r->fs->cache, r->score, BtDir, r->tag, OReadWrite);
-	if(0) fprint(2, "setEntry: b %#ux %d score=%V\n", b->addr, r->offset % r->epb, e->score);
+	if(0) fprint(2, "setEntry: b %#x %d score=%V\n", b->addr, r->offset % r->epb, e->score);
 	if(b == nil)
 		return 0;
 	if(!entryUnpack(&oe, b->data, r->offset % r->epb)){

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

@@ -77,7 +77,7 @@ sourceAlloc(Fs *fs, Block *b, Source *p, uint32_t offset, int mode,
 
 	if((e.flags & VtEntryLocal) && e.tag == 0){
 		pname = sourceName(p);
-		consPrint("%s: %s %V: sourceAlloc: flags %#ux tag %#ux\n",
+		consPrint("%s: %s %V: sourceAlloc: flags %#x tag %#x\n",
 			fs->name, pname, e.score, e.flags, e.tag);
 		goto Bad;
 	}

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

@@ -375,8 +375,8 @@ initxheader(void)
 		return stringnode("error unpacking header: %R");
 
 	t = stringnode("header "
-		"version=%#ux (%d) "
-		"blockSize=%#ux (%d) "
+		"version=%#x (%d) "
+		"blockSize=%#x (%d) "
 		"super=%#lux (%ld) "
 		"label=%#lux (%ld) "
 		"data=%#lux (%ld) "
@@ -416,8 +416,8 @@ initxsuper(void)
 	}
 	blockPut(b);
 	t = stringnode("super "
-		"version=%#ux "
-		"epoch=[%#ux,%#ux) "
+		"version=%#x "
+		"epoch=[%#x,%#x) "
 		"qid=%#llux "
 		"active=%#x "
 		"next=%#x "
@@ -456,7 +456,7 @@ initxvacroot(uint8_t score[VtScoreSize])
 		return stringnode("unpack %d-byte root: %R", n);
 
 	h.blockSize = vac.blockSize;
-	t = stringnode("vac version=%#ux name=%s type=%s blockSize=%u score=%V prev=%V",
+	t = stringnode("vac version=%#x name=%s type=%s blockSize=%u score=%V prev=%V",
 		vac.version, vac.name, vac.type, vac.blockSize, vac.score, vac.prev);
 	t->expand = xvacrootexpand;
 	return t;
@@ -465,7 +465,7 @@ initxvacroot(uint8_t score[VtScoreSize])
 Tnode*
 initxlabel(Label l)
 {
-	return stringnode("label type=%s state=%s epoch=%#ux tag=%#ux",
+	return stringnode("label type=%s state=%s epoch=%#x tag=%#x",
 		btStr(l.type), bsStr(l.state), l.epoch, l.tag);
 }
 
@@ -534,7 +534,7 @@ initxblock(Block *b, char *s, int (*gen)(void*, Block*, int, Tnode**),
 	if(b->addr == NilBlock)
 		t->str = smprint("Block %V: %s", b->score, s);
 	else
-		t->str = smprint("Block %#ux: %s", b->addr, s);
+		t->str = smprint("Block %#x: %s", b->addr, s);
 	t->printlabel = 1;
 	t->nkid = -1;
 	t->expand = xblockexpand;
@@ -591,10 +591,10 @@ initxentry(Entry e)
 
 	t = mallocz(sizeof *t, 1);
 	t->nkid = -1;
-	t->str = smprint("Entry gen=%#ux psize=%d dsize=%d depth=%d flags=%#ux size=%lld score=%V",
+	t->str = smprint("Entry gen=%#x psize=%d dsize=%d depth=%d flags=%#x size=%lld score=%V",
 		e.gen, e.psize, e.dsize, e.depth, e.flags, e.size, e.score);
 	if(e.flags & VtEntryLocal)
-		t->str = smprint("%s archive=%d snap=%d tag=%#ux", t->str, e.archive, e.snap, e.tag);
+		t->str = smprint("%s archive=%d snap=%d tag=%#x", t->str, e.archive, e.snap, e.tag);
 	t->expand = xentryexpand;
 	t->e = e;
 	return t;	
@@ -689,7 +689,7 @@ initxlocalroot(char *name, uint32_t addr)
 	localToGlobal(addr, score);
 	b = dataBlock(score, BtDir, RootTag);
 	if(b == nil)
-		return stringnode("read data block %#ux: %R", addr);
+		return stringnode("read data block %#x: %R", addr);
 	return initxblock(b, smprint("'%s' fs root", name), xlocalrootgen, nil);
 }
 

+ 1 - 1
sys/src/cmd/ip/snoopy/dns.c

@@ -195,7 +195,7 @@ p_seprint(Msg *m)
 		m->p = seprint(m->p, m->e, "error: %s", e);
 		return 0;
 	}
-	m->p = seprint(m->p, m->e, "id=%d flags=%#ux", dm.id, dm.flags);
+	m->p = seprint(m->p, m->e, "id=%d flags=%#x", dm.id, dm.flags);
 	donext(m);
 	return 0;
 }

+ 2 - 2
sys/src/cmd/ip/snoopy/gre.c

@@ -187,7 +187,7 @@ p_seprint(Msg *m)
 
 	demux(p_mux, h.proto, h.proto, m, &dump);
 
-	m->p = seprint(m->p, m->e, "version=%d proto=%#ux flags=%#.4ux", h.version, h.proto, h.flags);
+	m->p = seprint(m->p, m->e, "version=%d proto=%#x flags=%#.4ux", h.version, h.proto, h.flags);
 	if(h.flags&GRE_chksum)
 		m->p = seprint(m->p, m->e, " checksum=%#.4ux", h.chksum);
 	if(h.flags&GRE_key)
@@ -197,7 +197,7 @@ p_seprint(Msg *m)
 	if(h.flags&GRE_ack)
 		m->p = seprint(m->p, m->e, " ack=%#.8ulx", h.ack);
 	if(h.flags&GRE_routing)
-		m->p = seprint(m->p, m->e, " offset=%#ux haverouting", h.offset);
+		m->p = seprint(m->p, m->e, " offset=%#x haverouting", h.offset);
 	if(h.version == 0)
 		m->p = seprint(m->p, m->e, " recursion=%u", (h.flags&GRE_recur)>>8);
 	

+ 1 - 1
sys/src/cmd/postscript/tr2post/conv.c

@@ -104,7 +104,7 @@ conv(Biobufhdr *Bp) {
 	}
 	endpage();
 	if (debug) {
-		fprint(2, "r=%#ux\n", r);
+		fprint(2, "r=%#x\n", r);
 		fprint(2, "leaving conv\n");
 	}
 }

+ 1 - 1
sys/src/cmd/usb/audio.c

@@ -48,7 +48,7 @@ audio_endpoint(Dev *_, Desc *dd)
 	switch(b[2]){
 	case 0x01:
 		if(usbdebug){
-			fprint(2, "CS_ENDPOINT for attributes 0x%x, lockdelayunits %d, lockdelay %#ux, ",
+			fprint(2, "CS_ENDPOINT for attributes 0x%x, lockdelayunits %d, lockdelay %#x, ",
 				b[3], b[4], b[5] | (b[6]<<8));
 			if(b[3] & has_setspeed)
 				fprint(2, "has sampling-frequency control");

+ 4 - 4
sys/src/cmd/usb/usbd/usbd.c

@@ -56,7 +56,7 @@ checkhubstatus(Hub *h)
 		return;
 	}
 	sts = GET2(buf);
-	dprint(2, "hub %s: status %#ux\n", h->dev->dir, sts);
+	dprint(2, "hub %s: status %#x\n", h->dev->dir, sts);
 }
 #endif
 
@@ -341,7 +341,7 @@ portattach(Hub *h, int p, int sts)
 	pp = &h->port[p];
 	nd = nil;
 	pp->state = Pattached;
-	dprint(2, "%s: %s: port %d attach sts %#ux\n", argv0, d->dir, p, sts);
+	dprint(2, "%s: %s: port %d attach sts %#x\n", argv0, d->dir, p, sts);
 	sleep(Connectdelay);
 	if(hubfeature(h, p, Fportenable, 1) < 0)
 		dprint(2, "%s: %s: port %d: enable: %r\n", argv0, d->dir, p);
@@ -366,7 +366,7 @@ portattach(Hub *h, int p, int sts)
 		sp = "low";
 	if(sts & PShigh)
 		sp = "high";
-	dprint(2, "%s: %s: port %d: attached status %#ux\n", argv0, d->dir, p, sts);
+	dprint(2, "%s: %s: port %d: attached status %#x\n", argv0, d->dir, p, sts);
 
 	if(devctl(d, "newdev %s %d", sp, p) < 0){
 		fprint(2, "%s: %s: port %d: newdev: %r\n", argv0, d->dir, p);
@@ -608,7 +608,7 @@ enumhub(Hub *h, int p)
 			dprint(2, "%s: %s: port %d: enable: %r\n", argv0, d->dir, p);
 		sleep(Enabledelay);
 		sts = portstatus(h, p);
-		fprint(2, "%s: %s: port %d: resumed (sts %#ux)\n", argv0, d->dir, p, sts);
+		fprint(2, "%s: %s: port %d: resumed (sts %#x)\n", argv0, d->dir, p, sts);
 	}
 	if((pp->sts & PSpresent) == 0 && (sts & PSpresent) != 0){
 		if(portattach(h, p, sts) != nil)

+ 3 - 3
sys/src/cmd/venti/srv/hdisk.c

@@ -261,7 +261,7 @@ diskarenapart(HConnect *c, char *disk, Part *p)
 	vtfree(blk);
 
 	hprint(&c->hout, "head:\n<pre>\n");
-	hprint(&c->hout, "version=%d name=%s blocksize=%d size=%#llx clumpmagic=%#ux\n",
+	hprint(&c->hout, "version=%d name=%s blocksize=%d size=%#llx clumpmagic=%#x\n",
 		head.version, head.name, head.blocksize, head.size, 
 		head.clumpmagic);
 	hprint(&c->hout, "</pre><br><br>\n");
@@ -295,7 +295,7 @@ diskarenapart(HConnect *c, char *disk, Part *p)
 	hprint(&c->hout, "version=%d name=%s\n", arena.version, arena.name);
 	hprint(&c->hout, "ctime=%d %s\n", arena.ctime, fmttime(tbuf, arena.ctime));
 	hprint(&c->hout, "wtime=%d %s\n", arena.wtime, fmttime(tbuf, arena.wtime));
-	hprint(&c->hout, "clumpmagic=%#ux\n", arena.clumpmagic);
+	hprint(&c->hout, "clumpmagic=%#x\n", arena.clumpmagic);
 	hprint(&c->hout, "score %V\n", arena.score);
 	hprint(&c->hout, "diskstats:\n");
 	hprint(&c->hout, "\tclumps=%,d cclumps=%,d used=%,lld uncsize=%,lld sealed=%d\n",
@@ -459,7 +459,7 @@ diskarenaclump(HConnect *c, Arena *arena, int64_t off, char *scorestr)
 		hprint(&c->hout, "unpackclump: %r\n<br>");
 		rerrstr(err, sizeof err);
 		if(strstr(err, "magic")){
-			hprint(&c->hout, "trying again with magic=%#ux<br>\n", U32GET(blk));
+			hprint(&c->hout, "trying again with magic=%#x<br>\n", U32GET(blk));
 			if(unpackclump(&cl, blk, U32GET(blk)) < 0){
 				hprint(&c->hout, "unpackclump: %r\n<br>\n");
 				goto error;

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

@@ -667,7 +667,7 @@ findendpoints(Ums *ums)
 		if(!(Class(csp) == Clstorage && (Proto(csp) == Protobulk)))
 			continue;
 		if(sc != Subatapi && sc != Sub8070 && sc != Subscsi)
-			fprint(2, "disk: subclass %#ulx not supported. trying anyway\n", sc);
+			fprint(2, "disk: subclass %#lx not supported. trying anyway\n", sc);
 		if(ep->type == Ebulk){
 			if(ep->dir == Eboth || ep->dir == Ein)
 				if(epin == -1)

+ 1 - 1
sys/src/libusb/ether/asix.c

@@ -381,7 +381,7 @@ asixbread(Ether *e, Buf *bp)
 	nr = hd & 0xFFFF;
 	hd = (hd>>16) & 0xFFFF;
 	if(nr != (~hd & 0xFFFF)){
-		if(0)deprint(2, "%s: asixread: bad header %#ulx %#ulx\n",
+		if(0)deprint(2, "%s: asixread: bad header %#lx %#lx\n",
 			argv0, nr, (~hd & 0xFFFF));
 		werrstr("bad usb packet header");
 		rbp->ndata = 0;

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

@@ -16,7 +16,7 @@ static int
 checksize(int n)
 {
 	if(n < 256 || n > VtMaxLumpSize) {
-		werrstr("bad block size %#ux", n);
+		werrstr("bad block size %#x", n);
 		return -1;
 	}
 	return 0;