X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscansbr.c;h=4b712432cec19d13c833f0fd62e7578557e92d89;hb=4b5944268ea0da7bb30598a27857304758ea9b44;hp=8e02e575473ea4dd4ee42eaaf63822b48c556537;hpb=9f9bfa91d88b3ca4cd9206c1f2b17c6d13ebcaba;p=mmh

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8e02e57..4b71243 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -37,9 +37,6 @@
 #define SBUFSIZ 512
 
 static struct format *fmt;
-#ifdef JLR
-static struct format *fmt_top;
-#endif /* JLR */
 
 static struct comp *datecomp;  /* pntr to "date" comp */
 static struct comp *bodycomp;  /* pntr to "body" pseudo-comp (if referenced) */
@@ -74,7 +71,7 @@ int
 scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	int unseen, char *folder, long size, int noisy)
 {
-	int i, compnum, encrypted, state;
+	int i, compnum, state;
 	unsigned char *cp, *tmpbuf;
 	char **nxtbuf;
 	char *saved_c_text = NULL;
@@ -107,22 +104,11 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		/* Compile format string */
 		ncomps = fmt_compile(nfs, &fmt) + 1;
 
-#ifdef JLR
-		fmt_top = fmt;
-#endif /* JLR */
 		FINDCOMP(bodycomp, "body");
 		FINDCOMP(datecomp, "date");
 		FINDCOMP(cptr, "folder");
 		if (cptr && folder)
 			cptr->c_text = folder;
-		FINDCOMP(cptr, "encrypted");
-		if (!cptr)
-			if ((cptr = (struct comp *)calloc(1, sizeof(*cptr)))) {
-				cptr->c_name = "encrypted";
-				cptr->c_next = wantcomp[i = CHASH(cptr->c_name)];
-				wantcomp[i] = cptr;
-				ncomps++;
-		}
 		FINDCOMP(cptr, "dtimenow");
 		if (cptr)
 			cptr->c_text = getcpy(dtimenow(0));
@@ -354,9 +340,6 @@ finished:
 	if (noisy)
 		fputs(scanl, stdout);
 
-	FINDCOMP(cptr, "encrypted");
-	encrypted = cptr && cptr->c_text;
-
 	/* return dynamically allocated buffers to pool */
 	while ((cptr = *savecomp++)) {
 		*--nxtbuf = cptr->c_text;
@@ -367,7 +350,7 @@ finished:
 	if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
 		DIEWRERR();
 
-	return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
+	return (state != FILEEOF ? SCNERR : SCNMSG);
 }
 
 static int