Plan 9 from Bell Labs 2009-09-16

lib/face/48x48x4/.dict

@@ -6,6 +6,7 @@ aladdin.com/unknown g/ghost.1
 alcatel-lucent.com/ehg e/ehg.1
 alcatel-lucent.com/jmk j/jmk.1
 alcatel-lucent.com/ram r/ram.1
+alcatel-lucent.com/ronald.malic r/ram.1
 alcatel-lucent.com/sjf s/sjf.1
 alcatel-lucent.com/smullender s/sape.1
 alcatel-lucent.com/trickey h/howard.1

sys/src/9/pc/trap.c

@@ -693,7 +693,7 @@ syscall(Ureg* ureg)
 	ret = -1;
 	if(!waserror()){
 		if(scallnr >= nsyscall || systab[scallnr] == 0){
-			pprint("bad sys call number %d pc %lux\n",
+			pprint("bad sys call number %lud pc %lux\n",
 				scallnr, ureg->pc);
 			postnote(up, 1, "sys: bad sys call", NDebug);
 			error(Ebadarg);

sys/src/9/pc/vgamach64xx.c

@@ -1072,7 +1072,7 @@ ovl_enable(VGAscr *scr, Chan *c, char **field)
 static void
 ovl_status(VGAscr *scr, Chan *, char **field)
 {
-	pprint("%s: %s %.4uX, VT/GT %s, PRO %s, ovlclock %d, rev B %s, refclock %ld\n",
+	pprint("%s: %s %.4uX, VT/GT %s, PRO %s, ovlclock %lud, rev B %s, refclock %ld\n",
 		   scr->dev->name, field[0], mach64type->m64_id,
 		   mach64type->m64_vtgt? "yes": "no",
 		   mach64type->m64_pro? "yes": "no",

sys/src/9/port/cache.c

@@ -149,11 +149,11 @@ cprint(Chan *c, Mntcache *m, char *s)
 			ct = 0;
 		o = e->start+e->len;
 	}
-	pprint("%s: %#lux.%#lux %d %d %s (%d %c)\n",
-	s, m->qid.path, m->qid.vers, m->type, m->dev, c->path, nb, ct ? 'C' : 'N');
+	pprint("%s: %#llux.%#lux %d %d %s (%d %c)\n",
+	s, m->qid.path, m->qid.vers, m->type, m->dev, c->path->s, nb, ct ? 'C' : 'N');
 
 	for(e = m->list; e; e = e->next) {
-		pprint("\t%4d %5d %4d %lux\n",
+		pprint("\t%4d %5lud %4d %#p\n",
 			e->bid, e->start, e->len, e->cache);
 	}
 }

sys/src/9/port/devproc.c

@@ -434,7 +434,7 @@ procopen(Chan *c, int omode)
 		break;
 
 	default:
-		pprint("procopen %lux\n", c->qid);
+		pprint("procopen %#lux\n", QID(c->qid));
 		error(Egreg);
 	}
 

sys/src/9/port/devtls.c

@@ -1072,7 +1072,7 @@ tlsbread(Chan *c, long n, ulong offset)
 
 		/* return at most what was asked for */
 		b = qgrab(&tr->processed, n);
-if(tr->debug) pprint("consumed processed %d\n", BLEN(b));
+if(tr->debug) pprint("consumed processed %ld\n", BLEN(b));
 if(tr->debug) pdump(BLEN(b), b->rp, "consumed:");
 		qunlock(&tr->in.io);
 		poperror();
@@ -1221,7 +1221,7 @@ tlsrecwrite(TlsRec *tr, int type, Block *b)
 		nexterror();
 	}
 	qlock(&out->io);
-if(tr->debug)pprint("send %d\n", BLEN(b));
+if(tr->debug)pprint("send %ld\n", BLEN(b));
 if(tr->debug)pdump(BLEN(b), b->rp, "sent:");
 
 

sys/src/9/port/portfns.h

@@ -391,3 +391,4 @@ long		lcycles(void);
 
 #pragma varargck argpos iprint	1
 #pragma	varargck argpos	panic	1
+#pragma varargck argpos pprint	1