Merge remote-tracking branch 'upstream/master'

3 files changed, 2 insertions, 10 deletions

diff --git a/src/cmd/upas/nfs/decode.c b/src/cmd/upas/nfs/decode.c
index aed01cf3..3f8c4c68 100644
--- a/src/cmd/upas/nfs/decode.c
+++ b/src/cmd/upas/nfs/decode.c
@@ -143,7 +143,6 @@ tcs(char *charset, char *s)
 	int fd[3], p[2], pp[2];
 	uchar *us;
 	char *t, *u;
-	char *argv[4];
 	Rune r;
 	Writeargs *w;
 
@@ -173,11 +172,6 @@ latin1:
 	goto latin1;
 
 tcs:
-	argv[0] = "tcs";
-	argv[1] = "-f";
-	argv[2] = charset;
-	argv[3] = nil;
-	
 	if(pipe(p) < 0 || pipe(pp) < 0)
 		sysfatal("pipe: %r");
 	fd[0] = p[0];
diff --git a/src/cmd/upas/nfs/fs.c b/src/cmd/upas/nfs/fs.c
index ee5c2b9b..69cd6b5a 100644
--- a/src/cmd/upas/nfs/fs.c
+++ b/src/cmd/upas/nfs/fs.c
@@ -950,7 +950,7 @@ mkmsglist(Box *box, char **f, int nf, Msg ***mm)
 static void
 fswrite(Req *r)
 {
-	int i, j, c, type, flag, unflag, flagset, f, reset;
+	int i, j, c, type, flag, unflag, flagset, f;
 	Box *box;
 	Msg *msg;
 	Part *part;
@@ -1076,7 +1076,6 @@ fswrite(Req *r)
 		flag = 0;
 		unflag = 0;
 		flagset = 0;
-		reset = 0;
 		for(i=0; i<cb->nf; i++){
 			f = 0;
 			c = cb->f[i][0];
diff --git a/src/cmd/upas/nfs/imap.c b/src/cmd/upas/nfs/imap.c
index 1936c115..2cbe99e1 100644
--- a/src/cmd/upas/nfs/imap.c
+++ b/src/cmd/upas/nfs/imap.c
@@ -345,7 +345,7 @@ imapvcmdsx0(Imap *z, char *fmt, va_list arg, int dotag)
 {
 	char *s;
 	Fmt f;
-	int prefix, len;
+	int len;
 	Sx *sx;
 	
 	if(canqlock(&z->lk))
@@ -354,7 +354,6 @@ imapvcmdsx0(Imap *z, char *fmt, va_list arg, int dotag)
 	if(z->fd < 0 || !z->connected)
 		return nil;
 
-	prefix = strlen(tag)+1;
 	fmtstrinit(&f);
 	if(dotag)
 		fmtprint(&f, "%s ", tag);