X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=6931b2eb25d1f41fbe3cc6b83741a7c7587c735d;hp=e7663cd51c9192664b1b310fd281174dd171074c;hb=10eff860a28b96582526eb739fd0a55441669938;hpb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index e7663cd..6931b2e 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -139,7 +139,7 @@ int ismbox = FALSE;
 ** is used in m_Eom because the first character of the string
 ** has been read and matched before m_Eom is called.
 */
-char *msg_delim = "";
+static char *msg_delim = "";
 
 static unsigned char *fdelim;
 static unsigned char *delimend;
@@ -187,8 +187,6 @@ m_getfld(int state, unsigned char *name, unsigned char *buf,
 	}
 
 	switch (state) {
-	case FLDEOF:
-	case BODYEOF:
 	case FLD:
 		if (c == '\n' || c == '-') {
 			/* we hit the header/body separator */
@@ -611,7 +609,7 @@ thisisanmbox(FILE *iob)
 		continue;
 	}
 	c = strlen(delimstr);
-	fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
+	fdelim = (unsigned char *) mh_xcalloc((size_t) (c + 3), sizeof(char));
 	*fdelim++ = '\0';
 	*fdelim = '\n';
 	msg_delim = (char *)fdelim+1;
@@ -628,7 +626,7 @@ thisisanmbox(FILE *iob)
 	** separator) or the last char (since the matchc would have found it
 	** if it was a real delim).
 	*/
-	pat_map = (unsigned char **) calloc(256, sizeof(unsigned char *));
+	pat_map = (unsigned char **) mh_xcalloc(256, sizeof(unsigned char *));
 
 	for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
 		pat_map[(unsigned char)*cp] = (unsigned char *) cp;