X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_compile.c;h=a478acb788c585e25aa9b1b4ceb639849236c6e3;hb=e345f8fdce3a18cab73f3edf65ca60f8357efda0;hp=4c64b9c6aa405cd51a585864b5e40bb2676466c5;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68;p=mmh

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 4c64b9c..a478acb 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -423,13 +423,11 @@ do_name(char *sp, int preprocess)
 	if (cm->c_type & CT_ADDR) {
 	    CERROR("component used as both date and address");
 	}
-	if (! (cm->c_type & CT_DATE)) {
-	    cm->c_tws = (struct tws *)
-				calloc((size_t) 1, sizeof(*cm->c_tws));
-	    fp->f_type = preprocess;
-	    PUTCOMP(sp);
-	    cm->c_type |= CT_DATE;
-	}
+	cm->c_tws = (struct tws *)
+	    calloc((size_t) 1, sizeof(*cm->c_tws));
+	fp->f_type = preprocess;
+	PUTCOMP(sp);
+	cm->c_type |= CT_DATE;
 	break;
 
     case FT_MYMBOX:
@@ -437,18 +435,15 @@ do_name(char *sp, int preprocess)
 	    ismymbox ((struct mailname *) 0);
 	    primed++;
 	}
-	cm->c_type |= CT_MYMBOX;
 	/* fall through */
     case FT_PARSEADDR:
 	if (cm->c_type & CT_DATE) {
 	    CERROR("component used as both date and address");
 	}
-	if (! (cm->c_type & CT_ADDRPARSE)) {
-	    cm->c_mn = &fmt_mnull;
-	    fp->f_type = preprocess;
-	    PUTCOMP(sp);
-	    cm->c_type |= (CT_ADDR | CT_ADDRPARSE);
-	}
+	cm->c_mn = &fmt_mnull;
+	fp->f_type = preprocess;
+	PUTCOMP(sp);
+	cm->c_type |= CT_ADDR;
 	break;
 
     case FT_FORMATADDR: