X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=73ad5f298c74eefbb11ebe668932dbcb7820eadb;hp=d2433a2013e349595afca09ad376127be64fa961;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=10eff860a28b96582526eb739fd0a55441669938

diff --git a/uip/flist.c b/uip/flist.c
index d2433a2..73ad5f2 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -60,6 +60,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 struct Folder {
 	char *name;  /* name of folder */
 	int priority;
@@ -143,7 +145,7 @@ main(int argc, char **argv)
 	/* allocate the initial space to record the folder names */
 	numfolders = 0;
 	maxfolders = MAXFOLDERS;
-	foldersToDo = (char **) mh_xcalloc((size_t) maxfolders, sizeof(*foldersToDo));
+	foldersToDo = mh_xcalloc(maxfolders, sizeof(*foldersToDo));
 
 	/* no sequences yet */
 	numsequences = 0;
@@ -220,10 +222,10 @@ main(int argc, char **argv)
 			*/
 			if (numfolders >= maxfolders) {
 				maxfolders += MAXFOLDERS;
-				foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
+				foldersToDo = mh_xrealloc(foldersToDo, maxfolders * sizeof(*foldersToDo));
 			}
 			if (*cp == '+' || *cp == '@') {
-				foldersToDo[numfolders++] = getcpy(expandfol(cp));
+				foldersToDo[numfolders++] = mh_xstrdup(expandfol(cp));
 			} else
 				foldersToDo[numfolders++] = cp;
 		}
@@ -250,7 +252,7 @@ main(int argc, char **argv)
 		} else {
 			cp = seq_unseen;  /* use default */
 		}
-		dp = getcpy(cp);
+		dp = mh_xstrdup(cp);
 		ap = brkstring(dp, " ", "\n");
 		for (; ap && *ap; ap++) {
 			if (numsequences >= NUMATTRS) {
@@ -294,7 +296,7 @@ GetFolderOrder(void)
 			AllocFolders(&orders, &nOrdersAlloced, nOrders + 1);
 			o = &orders[nOrders++];
 			o->priority = priority++;
-			o->name = (char *) mh_xcalloc(p - s + 1, sizeof(char));
+			o->name = mh_xcalloc(p - s + 1, sizeof(char));
 			strncpy(o->name, s, p - s);
 			o->name[p - s] = 0;
 		} else
@@ -464,7 +466,7 @@ AddFolder(char *name, int force)
 		/* Oops, error occurred.  Record it and continue. */
 		AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
 		f = &folders[nFolders++];
-		f->name = getcpy(name);
+		f->name = mh_xstrdup(name);
 		f->error = 1;
 		f->priority = AssignPriority(f->name);
 		return 0;
@@ -501,7 +503,7 @@ AddFolder(char *name, int force)
 		/* save general folder information */
 		AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
 		f = &folders[nFolders++];
-		f->name = getcpy(name);
+		f->name = mh_xstrdup(name);
 		f->nMsgs = mp->nummsg;
 		f->error = 0;
 		f->priority = AssignPriority(f->name);
@@ -623,11 +625,10 @@ AllocFolders(struct Folder **f, int *nfa, int n)
 		return;
 	if (*f == NULL) {
 		*nfa = 10;
-		*f = (struct Folder *) mh_xcalloc(*nfa, sizeof(struct Folder));
+		*f = mh_xcalloc(*nfa, sizeof(struct Folder));
 	} else {
 		*nfa *= 2;
-		*f = (struct Folder *) mh_xrealloc(
-				*f, *nfa * (sizeof(struct Folder)));
+		*f = mh_xrealloc(*f, *nfa * sizeof(struct Folder));
 	}
 }