Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index c98a3f0..71ae8e8 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,9 +17,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
 #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.
 /*
 ** We allocate space to record the names of folders
 ** (foldersToDo array), this number of elements at a time.

@@ -55,7 +52,7 @@ static struct swit switches[] = {
 #define NOTOTALSW  12
        { "nototal", -7 },
 #define VERSIONSW  13
 #define NOTOTALSW  12
        { "nototal", -7 },
 #define VERSIONSW  13

-       { "version", 0 },
+       { "Version", 0 },

 #define HELPSW  14
        { "help", 0 },
        { NULL, 0 }
 #define HELPSW  14
        { "help", 0 },
        { NULL, 0 }

@@ -74,7 +71,7 @@ static struct Folder *orders = NULL;
 static int nOrders = 0;
 static int nOrdersAlloced = 0;
 static struct Folder *folders = 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 */
 static int nFoldersAlloced = 0;
 
 /* info on folders to search */

@@ -84,7 +81,7 @@ static int maxfolders;
 
 /* info on sequences to search for */
 static char *sequencesToDo[NUMATTRS];
 
 /* 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 all = FALSE;  /* scan all folders in top level? */
 static int alphaOrder = FALSE;  /* want alphabetical order only */

@@ -460,7 +457,8 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 int
 AddFolder(char *name, int force)
 {
 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;
        int seqnum[NUMATTRS], nSeq[NUMATTRS];
        struct Folder *f;
        struct msgs *mp;

@@ -532,8 +530,8 @@ void
 PrintFolders(void)
 {
        char tmpname[BUFSIZ];
 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) {
        int maxnum = 0, maxseq = 0;
 
        if (!Total) {