From de9f8d305cb456d8eadfc67de093f89176044cba Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 15 Jan 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-01-15

---
 boot/nopsession.c | 3 ---
 boot/settime.c    | 3 ---
 port/auth.c       | 1 -
 port/chan.c       | 4 ----
 port/devcons.c    | 3 +--
 port/portfns.h    | 5 -----
 6 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/boot/nopsession.c b/boot/nopsession.c
index 4d3f3494e533a8d981688e7797ad9fe71925e678..8893ac35dba41d69b6c06ba09a876f324ebea066 100644
--- a/boot/nopsession.c
+++ b/boot/nopsession.c
@@ -4,9 +4,6 @@
 #include <fcall.h>
 #include "../boot/boot.h"
 
-/*BUG transition*/
-int client9p=2;
-int kernel9p=2;
 static Fcall	hdr;
 
 static void
diff --git a/boot/settime.c b/boot/settime.c
index fee09e280cc841897c926f38af2a1d7d62121cf9..8e9ceac107a978daa4466e1b79ae3bfd4cd38c00 100644
--- a/boot/settime.c
+++ b/boot/settime.c
@@ -3,9 +3,6 @@
 #include <auth.h>
 #include <fcall.h>
 #include "../boot/boot.h"
-/*BUG transition*/
-int client9p=2;
-int kernel9p=2;
 
 static long lusertime(char*);
 
diff --git a/port/auth.c b/port/auth.c
index 4b99fb22ac51bee24296ac3764034f596f6df258..d5e716b77519d8a6721226cd77267373a76c84bd 100644
--- a/port/auth.c
+++ b/port/auth.c
@@ -8,7 +8,6 @@
 #include	<authsrv.h>
 
 char	*eve;
-char	evekey[DESKEYLEN];
 char	hostdomain[DOMLEN];
 
 /*
diff --git a/port/chan.c b/port/chan.c
index c2bae6e7c93c04c72ba76ccdebdac4e5a182e50c..18fed4e6c83d7dae2c833c9ccbba2be069dc7db4 100644
--- a/port/chan.c
+++ b/port/chan.c
@@ -8,10 +8,6 @@
 int chandebug=0;		/* toggled by sysr1 */
 QLock chanprint;		/* probably asking for trouble (deadlocks) -rsc */
 
-/* transition BUG */
-int client9p = 2;
-int kernel9p = 2;
-
 int domount(Chan**, Mhead**);
 Ref mheadcounter;
 
diff --git a/port/devcons.c b/port/devcons.c
index b93aea0c431216a2f8c0b06d09f465f4756987f8..7d95b1e2ca61e42910519facb92b5056065356aa 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -103,8 +103,7 @@ putstrn0(char *str, int n, int usewrite)
 	char *t;
 
 	/*
-	 *  if someone is reading /dev/kprint and the message
-	 *  is from the kernel (as opposed to from conswrite),
+	 *  if someone is reading /dev/kprint,
 	 *  put the message there.
 	 *  if not and there's an attached bit mapped display,
 	 *  put the message there.
diff --git a/port/portfns.h b/port/portfns.h
index 26123b93e25b82f3bedf6dbd6b2a1ad3640ca28e..f8a3b5a4304f55fc66acf23599fa2402e7d9a9d2 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -108,7 +108,6 @@ void		free(void*);
 void		freeb(Block*);
 void		freeblist(Block*);
 int		freebroken(void);
-void		freechan(Chan*);
 void		freepte(Segment*, Pte*);
 void		freesegs(int);
 void		freesession(Session*);
@@ -141,7 +140,6 @@ void		kbdrepeat(int);
 long		keyread(char*, int, long);
 void		kickpager(void);
 void		killbig(void);
-int		kprint(char*, ...);
 void		kproc(char*, void(*)(void*), void*);
 void		kprocchild(Proc*, void (*)(void*), void*);
 void		(*kproftimer)(ulong);
@@ -231,7 +229,6 @@ void		putmmu(ulong, ulong, Page*);
 void		putpage(Page*);
 void		putseg(Segment*);
 void		putstr(char*);
-void		putstr(char*);
 void		putstrn(char*, int);
 void		putswap(Page*);
 ulong		pwait(Waitmsg*);
@@ -281,7 +278,6 @@ void		resched(char*);
 void		resrcwait(char*);
 int		return0(void*);
 void		rlock(RWlock*);
-void		rootreq(Chan*, Mnt*);
 long		rtctime(void);
 void		runlock(RWlock*);
 Proc*		runproc(void);
@@ -290,7 +286,6 @@ void		(*saveintrts)(void);
 void		sched(void);
 void		scheddump(void);
 void		schedinit(void);
-int		screenbits(void);
 void		(*screenputs)(char*, int);
 long		seconds(void);
 ulong		segattach(Proc*, ulong, char *, ulong, ulong);