X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_read.c;h=722ee2fd51f7abcc023f39f57383ce344e7fb230;hp=67775f1bc2e0d31a02fb407a57cd5405dcf0eace;hb=b6823062c9806496b39ff12bf1fbe43ae127c96c;hpb=10eff860a28b96582526eb739fd0a55441669938

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 67775f1..722ee2f 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -33,20 +33,20 @@ folder_read(char *name)
 	struct dirent *dp;
 	DIR *dd;
 
-	name = getcpy(toabsdir(name));
+	name = mh_xstrdup(toabsdir(name));
 	if (!(dd = opendir(name))) {
-		free(name);
+		mh_free0(&name);
 		return NULL;
 	}
 
 	if (stat(name, &st) == -1) {
-		free(name);
+		mh_free0(&name);
 		closedir(dd);
 		return NULL;
 	}
 
 	/* Allocate the main structure for folder information */
-	mp = (struct msgs *) mh_xcalloc(1, (size_t) sizeof(*mp));
+	mp = mh_xcalloc(1, sizeof(*mp));
 
 	clear_folder_flags(mp);
 	mp->foldpath = name;
@@ -66,7 +66,7 @@ folder_read(char *name)
 	** name of the messages in this folder.
 	*/
 	len = NUMMSGS;
-	mi = (int *) mh_xcalloc((size_t) len, sizeof(*mi));
+	mi = mh_xcalloc(len, sizeof(*mi));
 
 	while ((dp = readdir(dd))) {
 		if ((msgnum = m_atoi(dp->d_name)) && msgnum > 0) {
@@ -76,7 +76,7 @@ folder_read(char *name)
 			*/
 			if (mp->nummsg >= len) {
 				len += NUMMSGS;
-				mi = (int *) mh_xrealloc(mi, (size_t) (len * sizeof(*mi)));
+				mi = mh_xrealloc(mi, len * sizeof(*mi));
 			}
 
 			/* Check if this is the first message we've seen */
@@ -146,7 +146,7 @@ folder_read(char *name)
 	for (msgnum = 0; msgnum < mp->nummsg; msgnum++)
 		set_exists(mp, mi[msgnum]);
 
-	free(mi);  /* We don't need this anymore */
+	mh_free0(&mi);  /* We don't need this anymore */
 
 	/*
 	** Read and initialize the sequence information.