X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fflist.c;h=ac680806ee8e5a4c0f4175f918a2d3702bfe4780;hb=ea21fe2c4bd23c639bef251398fae809875732ec;hp=c98a3f0629509b6ec48c61037f486afb02950e5c;hpb=d3ba09a465cb0e5fc9a74d0b152a7ed965f895cb;p=mmh

diff --git a/uip/flist.c b/uip/flist.c
index c98a3f0..ac68080 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,9 +17,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-#define FALSE   0
-#define TRUE    1
-
 /*
 ** We allocate space to record the names of folders
 ** (foldersToDo array), this number of elements at a time.
@@ -50,13 +47,9 @@ static struct swit switches[] = {
 	{ "fast", 0 },
 #define NOFASTSW  10
 	{ "nofast", 0 },
-#define TOTALSW  11
-	{ "total", -5 },
-#define NOTOTALSW  12
-	{ "nototal", -7 },
-#define VERSIONSW  13
-	{ "version", 0 },
-#define HELPSW  14
+#define VERSIONSW  11
+	{ "Version", 0 },
+#define HELPSW  12
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -74,7 +67,7 @@ static struct Folder *orders = NULL;
 static int nOrders = 0;
 static int nOrdersAlloced = 0;
 static struct Folder *folders = NULL;
-static int nFolders = 0;
+static unsigned int nFolders = 0;
 static int nFoldersAlloced = 0;
 
 /* info on folders to search */
@@ -84,13 +77,13 @@ static int maxfolders;
 
 /* info on sequences to search for */
 static char *sequencesToDo[NUMATTRS];
-static int numsequences;
+static unsigned int numsequences;
 
 static int all = FALSE;  /* scan all folders in top level? */
 static int alphaOrder = FALSE;  /* want alphabetical order only */
 static int recurse = FALSE;  /* show nested folders? */
 static int showzero   = TRUE;  /* show folders even if no messages in seq? */
-static int Total = TRUE;  /* display info on number of messages in
+static int fastsw = FALSE;  /* display info on number of messages in
 		* sequence found, and total num messages */
 
 static char curfol[BUFSIZ];  /* name of the current folder */
@@ -202,14 +195,11 @@ main(int argc, char **argv)
 				alphaOrder = FALSE;
 				break;
 
-			case NOFASTSW:
-			case TOTALSW:
-				Total = TRUE;
-				break;
-
 			case FASTSW:
-			case NOTOTALSW:
-				Total = FALSE;
+				fastsw = TRUE;
+				break;
+			case NOFASTSW:
+				fastsw = FALSE;
 				break;
 
 			case RECURSE:
@@ -460,7 +450,8 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 int
 AddFolder(char *name, int force)
 {
-	int i, msgnum, nonzero;
+	unsigned int i;
+	int msgnum, nonzero;
 	int seqnum[NUMATTRS], nSeq[NUMATTRS];
 	struct Folder *f;
 	struct msgs *mp;
@@ -532,11 +523,11 @@ void
 PrintFolders(void)
 {
 	char tmpname[BUFSIZ];
-	int i, j, len, has_private = 0;
-	int maxfolderlen = 0, maxseqlen = 0;
+	unsigned int i, j, len, has_private = 0;
+	unsigned int maxfolderlen = 0, maxseqlen = 0;
 	int maxnum = 0, maxseq = 0;
 
-	if (!Total) {
+	if (fastsw) {
 		for (i = 0; i < nFolders; i++)
 			printf("%s\n", folders[i].name);
 		return;