From 3c612e13a19b9a7f1d97d3dd82b07e70717e6b63 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 26 Sep 2013 22:30:24 +0200
Subject: fossil: fix various warnings

R=rsc
https://codereview.appspot.com/13980043
---
 src/cmd/fossil/archive.c   | 12 --------
 src/cmd/fossil/cache.c     |  8 ------
 src/cmd/fossil/check.c     |  2 --
 src/cmd/fossil/flfmt9660.c | 71 ----------------------------------------------
 src/cmd/fossil/view.c      |  2 --
 5 files changed, 95 deletions(-)

diff --git a/src/cmd/fossil/archive.c b/src/cmd/fossil/archive.c
index e862f70a..7a88f23e 100644
--- a/src/cmd/fossil/archive.c
+++ b/src/cmd/fossil/archive.c
@@ -128,18 +128,6 @@ shaBlock(uchar score[VtScoreSize], Block *b, uchar *data, uint bsize)
 	vtsha1(score, data, vtzerotruncate(vtType[b->l.type], data, bsize));
 }
 
-static uint
-etype(Entry *e)
-{
-	uint t;
-
-	if(e->flags&_VtEntryDir)
-		t = BtDir;
-	else
-		t = BtData;
-	return t+e->depth;
-}
-
 static uchar*
 copyBlock(Block *b, u32int blockSize)
 {
diff --git a/src/cmd/fossil/cache.c b/src/cmd/fossil/cache.c
index f473d211..f37a7101 100644
--- a/src/cmd/fossil/cache.c
+++ b/src/cmd/fossil/cache.c
@@ -283,7 +283,6 @@ cacheCheck(Cache *c)
 {
 	u32int size, now;
 	int i, k, refed;
-	static uchar zero[VtScoreSize];
 	Block *b;
 
 	size = c->size;
@@ -460,11 +459,6 @@ _cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers,
 	}
 	/* NOT REACHED */
 }
-static Block*
-cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers)
-{
-	return _cacheLocalLookup(c, part, addr, vers, Waitlock, 0);
-}
 
 
 /*
@@ -977,9 +971,7 @@ int
 blockSetLabel(Block *b, Label *l, int allocating)
 {
 	Block *lb;
-	Label oldl;
 
-	oldl = b->l;
 	lb = _blockSetLabel(b, l);
 	if(lb == nil)
 		return 0;
diff --git a/src/cmd/fossil/check.c b/src/cmd/fossil/check.c
index 7ce281e3..53a1bf20 100644
--- a/src/cmd/fossil/check.c
+++ b/src/cmd/fossil/check.c
@@ -751,7 +751,6 @@ error(Fsck *chk, char *fmt, ...)
 {
 	char buf[256];
 	va_list arg;
-	static int nerr;
 
 	va_start(arg, fmt);
 	vseprint(buf, buf+sizeof buf, fmt, arg);
@@ -768,7 +767,6 @@ warn(Fsck *chk, char *fmt, ...)
 {
 	char buf[256];
 	va_list arg;
-	static int nerr;
 
 	va_start(arg, fmt);
 	vseprint(buf, buf+sizeof buf, fmt, arg);
diff --git a/src/cmd/fossil/flfmt9660.c b/src/cmd/fossil/flfmt9660.c
index d4097957..f68bfb56 100644
--- a/src/cmd/fossil/flfmt9660.c
+++ b/src/cmd/fossil/flfmt9660.c
@@ -62,46 +62,6 @@ struct Voldesc {
 	uchar	fsvers;		/* file system version = 1 */
 };
 
-static void
-dumpbootvol(void *a)
-{
-	Voldesc *v;
-
-	v = a;
-	print("magic %.2ux %.5s %.2ux %2ux\n",
-		v->magic[0], v->magic+1, v->magic[6], v->magic[7]);
-	if(v->magic[0] == 0xFF)
-		return;
-
-	print("system %.32C\n", v->systemid);
-	print("volume %.32C\n", v->volumeid);
-	print("volume size %.4N\n", v->volsize);
-	print("charset %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux %.2ux\n",
-		v->charset[0], v->charset[1], v->charset[2], v->charset[3],
-		v->charset[4], v->charset[5], v->charset[6], v->charset[7]);
-	print("volume set size %.2N\n", v->volsetsize);
-	print("volume sequence number %.2N\n", v->volseqnum);
-	print("logical block size %.2N\n", v->blocksize);
-	print("path size %.4L\n", v->pathsize);
-	print("lpath loc %.4L\n", v->lpathloc);
-	print("opt lpath loc %.4L\n", v->olpathloc);
-	print("mpath loc %.4B\n", v->mpathloc);
-	print("opt mpath loc %.4B\n", v->ompathloc);
-	print("rootdir %D\n", v->rootdir);
-	print("volume set identifier %.128C\n", v->volsetid);
-	print("publisher %.128C\n", v->publisher);
-	print("preparer %.128C\n", v->prepid);
-	print("application %.128C\n", v->applid);
-	print("notice %.37C\n", v->notice);
-	print("abstract %.37C\n", v->abstract);
-	print("biblio %.37C\n", v->biblio);
-	print("creation date %.17s\n", v->cdate);
-	print("modification date %.17s\n", v->mdate);
-	print("expiration date %.17s\n", v->xdate);
-	print("effective date %.17s\n", v->edate);
-	print("fs version %d\n", v->fsvers);
-}
-
 typedef struct Cdir Cdir;
 struct Cdir {
 	uchar	len;
@@ -136,19 +96,6 @@ Dfmt(Fmt *fmt)
 	return 0;
 }
 
-char longc, shortc;
-static void
-bigend(void)
-{
-	longc = 'B';
-}
-
-static void
-littleend(void)
-{
-	longc = 'L';
-}
-
 static ulong
 big(void *a, int n)
 {
@@ -242,24 +189,6 @@ ascii(void)
 	fmtinstall('C', asciiTfmt);
 }
 
-static int
-runeTfmt(Fmt *fmt)
-{
-	Rune buf[256], *r;
-	int i;
-	uchar *p;
-
-	p = va_arg(fmt->args, uchar*);
-	for(i=0; i*2+2<=fmt->prec; i++, p+=2)
-		buf[i] = (p[0]<<8)|p[1];
-	buf[i] = L'\0';
-	for(r=buf+i; r>buf && r[-1]==L' '; r--)
-		;
-	r[0] = L'\0';
-	fmt->flags &= ~FmtPrec;
-	return fmtprint(fmt, "%S", buf);
-}
-
 static void
 getsect(uchar *buf, int n)
 {
diff --git a/src/cmd/fossil/view.c b/src/cmd/fossil/view.c
index 645a45a1..cd67333b 100644
--- a/src/cmd/fossil/view.c
+++ b/src/cmd/fossil/view.c
@@ -1007,8 +1007,6 @@ Tree t;
 void
 eresized(int new)
 {
-	Rectangle r;
-	r = screen->r;
 	if(new && getwindow(display, Refnone) < 0)
 		fprint(2,"can't reattach to window");
 	drawtree(&t, screen, screen->r);
-- 
cgit v1.2.3