fixfmt: change %#l*ux so the ux is now just u

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

sys/src/9/amd64/asm.c

@@ -334,7 +334,7 @@ asmmeminit(void)
 	mem = asmalloc(pa, sys->vmend - sys->vmunmapped, 1, 0);
 	if(mem != pa)
 		panic("asmmeminit 2");
-	DBG("pa %#llux mem %#llux\n", pa, mem);
+	DBG("pa %#llx mem %#llx\n", pa, mem);
 
 	/* assume already 2MiB aligned*/
 	assert(ALIGNED(sys->vmunmapped, 2*MiB));
@@ -411,7 +411,7 @@ asmmeminit(void)
 //  hi = 600*MiB;
 		conf.mem[cx].npage = (hi - lo)/PGSZ;
 		conf.npage += conf.mem[cx].npage;
-		print("cm %d: addr %#llux npage %lu\n",
+		print("cm %d: addr %#llx npage %lu\n",
 			cx, conf.mem[cx].base, conf.mem[cx].npage);
 		cx++;
 #endif /* ConfCrap */

sys/src/9/amd64/devacpi.c

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

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=%#x",
+		"sys: fp: %s Exception ipo=%#llx fsw=%#x",
 		cm, fpusave->rip, fsw);
 	return up->genbuf;
 }

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=%#x",
+	snprint(n, sizeof(n), "sys: fp: %s Exception ipo=%#llx fsw=%#x",
 		m, fpusave->rip, fsw);
 	postnote(up, 1, n, NDebug);
 }

sys/src/9/amd64/map.c

@@ -53,8 +53,8 @@ PADDR(void* va)
 KMap*
 kmap(Page* page)
 {
-	DBG("kmap(%#llux) @ %#p: %#p %#p\n",
-		page->pa, getcallerpc(&page),
+	DBG("kmap(%#llx) @ %#p: %#p %#p\n",
+		page->pa, getcallerpc(),
 		page->pa, KADDR(page->pa));
 
 	return KADDR(page->pa);

sys/src/9/amd64/sipi.c

@@ -40,7 +40,7 @@ sipi(void)
 		return;
 	sipiptr = UINT2PTR(SIPIHANDLER);
 	memmove(sipiptr, &b1978, 4096);
-	DBG("sipiptr %#p sipipa %#llux\n", sipiptr, sipipa);
+	DBG("sipiptr %#p sipipa %#llx\n", sipiptr, sipipa);
 
 	/*
 	 * Notes:

sys/src/cmd/cdfs/mmc.c

@@ -1693,7 +1693,7 @@ mmcxwrite(Otrack *o, void *v, int32_t nblk)
 	cmd[7] = nblk>>8;
 	cmd[8] = nblk>>0;
 	if(vflag > 1)
-		print("%lld ns: write+verify %ld at %#lux\n",
+		print("%lld ns: write+verify %ld at %#lx\n",
 			nsec(), nblk, aux->mmcnwa);
 	/*
 	 * we are using a private copy of scsi.c that doesn't retry writes

sys/src/cmd/db/format.c

@@ -112,7 +112,7 @@ exform(int fcount, int prt, char *ifp, Map *map, int literal,
 			break;
 
 		case 'A':
-			dprint("%#llux%10t", dot);
+			dprint("%#llx%10t", dot);
 			dotinc = 0;
 			break;
 

sys/src/cmd/db/print.c

@@ -162,7 +162,7 @@ printtrace(int modif)
 	case 'e':
 		for (i = 0; globalsym(&s, i); i++) {
 			if (get4(cormap, s.value, &w) > 0)
-				dprint("%s/%12t%#lux\n", s.name, w);
+				dprint("%s/%12t%#lx\n", s.name, w);
 		}
 		break;
 
@@ -356,7 +356,7 @@ printlocals(Symbol *fn, ADDR fp)
 		if (s.class != CAUTO)
 			continue;
 		if (get4(cormap, fp-s.value, &w) > 0)
-			dprint("%8t%s.%s/%10t%#lux\n", fn->name, s.name, w);
+			dprint("%8t%s.%s/%10t%#lx\n", fn->name, s.name, w);
 		else
 			dprint("%8t%s.%s/%10t?\n", fn->name, s.name);
 	}
@@ -378,6 +378,6 @@ printparams(Symbol *fn, ADDR fp)
 		if (first++)
 			dprint(", ");
 		if (get4(cormap, fp+s.value, &w) > 0)
-			dprint("%s=%#lux", s.name, w);
+			dprint("%s=%#lx", s.name, w);
 	}
 }

sys/src/cmd/db/trcrun.c

@@ -288,7 +288,7 @@ bkput(BKPT *bp, int install)
 	}else
 		ret = put1(cormap, loc, bp->save, machdata->bpsize);
 	if(ret < 0){
-		sprint(buf, "can't set breakpoint at %#llux: %r", bp->loc);
+		sprint(buf, "can't set breakpoint at %#llx: %r", bp->loc);
 		print(buf);
 		read(0, buf, 100);
 	}

sys/src/cmd/dossrv/dossubs.c

@@ -226,7 +226,7 @@ getfile(Xfile *f)
 	dp->d = nil;
 	if(!isroot(dp->addr)){
 		if(f->qid.path != QIDPATH(dp)){
-			chat("qid mismatch f=%#llux d=%#lux...", f->qid.path, QIDPATH(dp));
+			chat("qid mismatch f=%#llx d=%#lx...", f->qid.path, QIDPATH(dp));
 			putsect(p);
 			errno = Enonexist;
 			return -1;
@@ -1547,7 +1547,7 @@ makecontig(Xfile *f, int nextra)
 	isok = 1;
 	nclust = 0;
 	clust = fileclust(f, 0, 0);
-	chat("clust %#lux", clust);
+	chat("clust %#lx", clust);
 	if(clust != -1) {
 		for(;;) {
 			nclust++;
@@ -1569,7 +1569,7 @@ makecontig(Xfile *f, int nextra)
 			if(getfat(xf, eclust+i) != 0)
 				break;
 		if(i == nextra) {	/* they were all free */
-			chat("eclust=%#lx, getfat eclust-1 = %#lux\n", eclust, getfat(xf, eclust-1));
+			chat("eclust=%#lx, getfat eclust-1 = %#lx\n", eclust, getfat(xf, eclust-1));
 			assert(getfat(xf, eclust-1) == 0xffffffff);
 			putfat(xf, eclust-1, eclust);
 			putfat(xf, eclust, 0xffffffff);

sys/src/cmd/fossil/view.c

@@ -377,10 +377,10 @@ initxheader(void)
 	t = stringnode("header "
 		"version=%#x (%d) "
 		"blockSize=%#x (%d) "
-		"super=%#lux (%ld) "
-		"label=%#lux (%ld) "
-		"data=%#lux (%ld) "
-		"end=%#lux (%ld)",
+		"super=%#lx (%ld) "
+		"label=%#lx (%ld) "
+		"data=%#lx (%ld) "
+		"end=%#lx (%ld)",
 		h.version, h.version, h.blockSize, h.blockSize,
 		h.super, h.super,
 		h.label, h.label, h.data, h.data, h.end, h.end);
@@ -418,7 +418,7 @@ initxsuper(void)
 	t = stringnode("super "
 		"version=%#x "
 		"epoch=[%#x,%#x) "
-		"qid=%#llux "
+		"qid=%#llx "
 		"active=%#x "
 		"next=%#x "
 		"current=%#x "
@@ -724,16 +724,16 @@ initxdirentry(MetaEntry *me)
 	if(!deUnpack(&dir, me))
 		return stringnode("deUnpack: %R");
 
-	t = stringnode("dirEntry elem=%s size=%llu data=%#lux/%#lux meta=%#lux/%#lux", dir.elem, dir.size, dir.entry, dir.gen, dir.mentry, dir.mgen);
+	t = stringnode("dirEntry elem=%s size=%llu data=%#lx/%#lx meta=%#lx/%#lx", dir.elem, dir.size, dir.entry, dir.gen, dir.mentry, dir.mgen);
 	t->nkid = 1;
 	t->kid = mallocz(sizeof(t->kid[0])*1, 1);
 	t->kid[0] = stringnode(
-		"qid=%#llux\n"
+		"qid=%#llx\n"
 		"uid=%s gid=%s mid=%s\n"
 		"mtime=%lu mcount=%lu ctime=%lu atime=%lu\n"
 		"mode=%luo\n"
-		"plan9 %d p9path %#llux p9version %lu\n"
-		"qidSpace %d offset %#llux max %#llux",
+		"plan9 %d p9path %#llx p9version %lu\n"
+		"qidSpace %d offset %#llx max %#llx",
 		dir.qid,
 		dir.uid, dir.gid, dir.mid,
 		dir.mtime, dir.mcount, dir.ctime, dir.atime,

sys/src/cmd/ktrace.c

@@ -247,7 +247,7 @@ i386trace(uint64_t pc, uint64_t sp, uint64_t link)
 			sp += f.value-mach->szaddr;
 		}else if(strcmp(s.name, "forkret") == 0){
 //XXX
-			print("//passing interrupt frame; last pc found at sp=%#llux\n", osp);
+			print("//passing interrupt frame; last pc found at sp=%#llx\n", osp);
 
 			sp +=  15 * mach->szaddr;		/* pop interrupt frame */
 		}
@@ -256,12 +256,12 @@ i386trace(uint64_t pc, uint64_t sp, uint64_t link)
 //XXX
 		if(pc == 0 && strcmp(s.name, "forkret") == 0){
 			sp += 3 * mach->szaddr;			/* pop iret eip, cs, eflags */
-			print("//guessing call through invalid pointer, try again at sp=%#llux\n", sp);
+			print("//guessing call through invalid pointer, try again at sp=%#llx\n", sp);
 			s.name = "";
 			pc = getval(sp);
 		}
 		if(pc == 0) {
-			print("//didn't find pc at sp=%#llux, last pc found at sp=%#llux\n", sp, osp);
+			print("//didn't find pc at sp=%#llx, last pc found at sp=%#llx\n", sp, osp);
 			break;
 		}
 		osp = sp;
@@ -303,7 +303,7 @@ amd64trace(uint64_t pc, uint64_t sp, uint64_t link)
 			sp += f.value-mach->szaddr;
 		}
 		else if(isintrr){
-			print("//passing interrupt frame; last pc found at sp=%#llux\n", osp);
+			print("//passing interrupt frame; last pc found at sp=%#llx\n", osp);
 			/*
 			 * Pop interrupt frame (ureg.h) up to the IP value.
 			 */
@@ -319,13 +319,13 @@ amd64trace(uint64_t pc, uint64_t sp, uint64_t link)
 			 * SP from the saved frame.
 			 */
 			sp += 3 * mach->szaddr;
-			print("//guessing call through invalid pointer; try again at sp=%#llux\n", sp);
+			print("//guessing call through invalid pointer; try again at sp=%#llx\n", sp);
 			s.name = "";
 			sp = getval(sp);
 			pc = getval(sp);
 		}
 		if(pc == 0) {
-			print("//didn't find pc at sp=%#llux, last pc found at sp=%#llux\n", sp, osp);
+			print("//didn't find pc at sp=%#llx, last pc found at sp=%#llx\n", sp, osp);
 			break;
 		}
 		osp = sp;

sys/src/cmd/ssh1/cmsg.c

@@ -99,14 +99,14 @@ authuser(Conn *c)
 	}
 
 	for(i=0; i<c->nokauth; i++){
-		debug(DBG_AUTH, "authmask %#lux, consider %s (%#x)\n",
+		debug(DBG_AUTH, "authmask %#lx, consider %s (%#x)\n",
 			c->authmask, c->okauth[i]->name, 1<<c->okauth[i]->id);
 		if(c->authmask & (1<<c->okauth[i]->id))
 			if((*c->okauth[i]->fn)(c) == 0)
 				return 0;
 	}
 
-	debug(DBG_AUTH, "no auth methods worked; (authmask=%#lux)\n", c->authmask);
+	debug(DBG_AUTH, "no auth methods worked; (authmask=%#lx)\n", c->authmask);
 	return -1;
 }
 
@@ -232,7 +232,7 @@ sshclienthandshake(Conn *c)
 			break;
 		}
 	if(c->cipher == nil)
-		error("can't agree on ciphers: remote side supports %#lux", c->ciphermask);
+		error("can't agree on ciphers: remote side supports %#lx", c->ciphermask);
 
 	calcsessid(c);
 

sys/src/cmd/ssh1/msg.c

@@ -163,7 +163,7 @@ recvmsg0(Conn *c)
 	p = m->bp + pad+len-4;
 	crc0 = LONG(p);
 	if(crc != crc0){
-		werrstr("bad crc %#lux != %#lux (packet length %lu)", crc, crc0, len);
+		werrstr("bad crc %#lx != %#lx (packet length %lu)", crc, crc0, len);
 		free(m);
 		return nil;
 	}

sys/src/cmd/ssh2/netssh.c

@@ -1439,7 +1439,7 @@ stclunk(Fid *f)
 	cnum = (qidpath >> Connshift) & Connmask;
 	chnum = qidpath & Chanmask;
 	c = connections[cnum];
-	sshdebug(c, "got clunk on file: %#llux %d %d %d: %s",
+	sshdebug(c, "got clunk on file: %#llx %d %d %d: %s",
 		qidpath, lev, cnum, chnum, f->file->name);
 	/* qidpath test implies conn 0, chan 0 */
 	if (lev == Top && qidpath == Qreqrem) {
@@ -1523,7 +1523,7 @@ stflush(Req *r)
 	threadsetname("stflush");
 	or = r->oldreq;
 	qidpath = (uint64_t)or->fid->file->aux;
-	sshdebug(nil, "got flush on file %#llux %lld %lld %lld: %s %#p",
+	sshdebug(nil, "got flush on file %#llx %lld %lld %lld: %s %#p",
 		argv0, qidpath, qidpath >> Levshift,
 		(qidpath >> Connshift) & Connmask, qidpath & Chanmask,
 		or->fid->file->name, or->aux);

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

@@ -72,7 +72,7 @@ unpackarenapart(ArenaPart *ap, uint8_t *buf)
 
 	m = U32GET(p);
 	if(m != ArenaPartMagic){
-		seterr(ECorrupt, "arena set has wrong magic number: %s expected ArenaPartMagic (%#lux)", fmtmagic(fbuf, m), ArenaPartMagic);
+		seterr(ECorrupt, "arena set has wrong magic number: %s expected ArenaPartMagic (%#lx)", fmtmagic(fbuf, m), ArenaPartMagic);
 		return -1;
 	}
 	p += U32Size;
@@ -124,7 +124,7 @@ unpackarena(Arena *arena, uint8_t *buf)
 	m = U32GET(p);
 	if(m != ArenaMagic){
 		seterr(ECorrupt, "arena %d has wrong magic number: %s "
-			"expected ArenaMagic (%#lux)", debugarena,
+			"expected ArenaMagic (%#lx)", debugarena,
 			fmtmagic(fbuf, m), ArenaMagic);
 		return -1;
 	}
@@ -323,7 +323,7 @@ unpackarenahead(ArenaHead *head, uint8_t *buf)
 	m = U32GET(p);
 	if(m != ArenaHeadMagic){
 		seterr(ECorrupt, "arena %d head has wrong magic number: %s "
-			"expected ArenaHeadMagic (%#lux)", debugarena,
+			"expected ArenaHeadMagic (%#lx)", debugarena,
 			fmtmagic(fbuf, m), ArenaHeadMagic);
 		return -1;
 	}
@@ -544,7 +544,7 @@ unpackisect(ISect *is, uint8_t *buf)
 
 	m = U32GET(p);
 	if(m != ISectMagic){
-		seterr(ECorrupt, "index section has wrong magic number: %s expected ISectMagic (%#lux)",
+		seterr(ECorrupt, "index section has wrong magic number: %s expected ISectMagic (%#lx)",
 			fmtmagic(fbuf, m), ISectMagic);
 		return -1;
 	}
@@ -712,7 +712,7 @@ unpackbloomhead(Bloom *b, uint8_t *buf)
 
 	m = U32GET(p);
 	if(m != BloomMagic){
-		seterr(ECorrupt, "bloom filter has wrong magic number: %s expected BloomMagic (%#lux)", fmtmagic(fbuf, m),
+		seterr(ECorrupt, "bloom filter has wrong magic number: %s expected BloomMagic (%#lx)", fmtmagic(fbuf, m),
 		       (uint32_t)BloomMagic);
 		return -1;
 	}
@@ -731,7 +731,7 @@ unpackbloomhead(Bloom *b, uint8_t *buf)
 	b->size = U32GET(p);
 	p += U32Size;
 	if(b->size < BloomHeadSize || b->size > MaxBloomSize || (b->size&(b->size-1))){
-		seterr(ECorrupt, "bloom filter has invalid size %#lux", b->size);
+		seterr(ECorrupt, "bloom filter has invalid size %#lx", b->size);
 		return -1;
 	}
 

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

@@ -244,7 +244,7 @@ ptrace(Map *map, uint64_t pc, uint64_t sp, Symbol *sym)
 	printparams(map, sym, sp);
 	dprint(")");
 	if(nextpc != sym->value)
-		dprint("+%#llux ", nextpc - sym->value);
+		dprint("+%#llx ", nextpc - sym->value);
 	printsource(nextpc);
 	dprint("\n");
 	printlocals(map, sym, sp);

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

@@ -426,7 +426,7 @@ insertscore(uint8_t score[VtScoreSize], IAddr *ia, int state, AState *as)
 				getcallerpc(&score));
 		else{
 			if(icache.as.aa > as->aa)
-				fprint(2, "%T insertscore: aa moving backward: %#llux -> %#llux\n", icache.as.aa, as->aa);
+				fprint(2, "%T insertscore: aa moving backward: %#llx -> %#llx\n", icache.as.aa, as->aa);
 			icache.as = *as;
 		}
 	}

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

@@ -81,7 +81,7 @@ int
 ereadpart(Part *p, uint64_t offset, uint8_t *buf, uint32_t count)
 {
 	if(readpart(p, offset, buf, count) != count){
-		chat("%T readpart %s at %#llux+%u: %r\n", p->name, offset, count);
+		chat("%T readpart %s at %#llx+%u: %r\n", p->name, offset, count);
 		return -1;
 	}
 	return 0;
@@ -91,7 +91,7 @@ int
 ewritepart(Part *p, uint64_t offset, uint8_t *buf, uint32_t count)
 {
 	if(writepart(p, offset, buf, count) != count || flushpart(p) < 0){
-		chat("%T writepart %s at %#llux+%u: %r\n", p->name, offset, count);
+		chat("%T writepart %s at %#llx+%u: %r\n", p->name, offset, count);
 		return -1;
 	}
 	return 0;

sys/src/cmd/vnc/devdraw.c

@@ -235,7 +235,7 @@ drawgen(Chan *c, Dirtab*, int, int s, Dir *dp)
 			devdir(c, q, up->genbuf, 0, eve, 0500, dp);
 			break;
 		default:
-			panic("drawwalk %#llux", c->qid.path);
+			panic("drawwalk %#llx", c->qid.path);
 		}
 		return 1;
 	}

sys/src/libusb/lib/parse.c

@@ -143,7 +143,7 @@ parseendpt(Usbdev *d, Conf *c, Iface *ip, Altc *altc, uint8_t *b, int n,
 			break;
 	if(i == nelem(ip->ep)){
 		werrstr("parseendpt: bug: too many end points on interface "
-			"with csp %#lux", ip->csp);
+			"with csp %#lx", ip->csp);
 		fprint(2, "%s: %r\n", argv0);
 		return -1;
 	}