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

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 12d05b9..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;
@@ -165,8 +165,8 @@ int
 m_getfld(int state, unsigned char *name, unsigned char *buf,
 	int bufsz, FILE *iob)
 {
-	register unsigned char  *bp, *cp, *ep, *sp;
-	register int cnt, c, i, j;
+	unsigned char  *bp, *cp, *ep, *sp;
+	int cnt, c, i, j;
 
 	if ((c = getc(iob)) < 0) {
 		msg_count = 0;
@@ -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 */
@@ -576,10 +574,10 @@ finish:
 void
 thisisanmbox(FILE *iob)
 {
-	register int c;
+	int c;
 	char text[10];
-	register char *cp;
-	register char *delimstr;
+	char *cp;
+	char *delimstr;
 
 	c = getc(iob); 
 	if (feof(iob)) {
@@ -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;
@@ -642,8 +640,8 @@ thisisanmbox(FILE *iob)
 static int
 m_Eom(int c, FILE *iob)
 {
-	register long pos = 0L;
-	register int i;
+	long pos = 0L;
+	int i;
 	char text[10];
 
 	pos = ftell(iob);
@@ -674,11 +672,11 @@ m_Eom(int c, FILE *iob)
 static unsigned char *
 matchc(int patln, char *pat, int strln, char *str)
 {
-	register char *es = str + strln - patln;
-	register char *sp;
-	register char *pp;
-	register char *ep = pat + patln;
-	register char pc = *pat++;
+	char *es = str + strln - patln;
+	char *sp;
+	char *pp;
+	char *ep = pat + patln;
+	char pc = *pat++;
 
 	for(;;) {
 		while (pc != *str++)