X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=bbd46261832af013b539726a44f95fa83140c3c9;hp=a43044c8a637b76264afd89969569069ff0d5527;hb=e6c75593757a6edb5eb8e98bfc50f0c1de36bf2f;hpb=3fe7a0704e4ab592003af2e66c3003718ecde2c1

diff --git a/uip/scansbr.c b/uip/scansbr.c
index a43044c..bbd4626 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -41,17 +41,17 @@ static struct format *fmt;
 static struct comp *datecomp;  /* pntr to "date" comp */
 static struct comp *bodycomp;  /* pntr to "body" pseudo-comp (if referenced) */
 static int ncomps = 0;  /* # of interesting components */
-static char **compbuffers = 0;  /* buffers for component text */
-static struct comp **used_buf = 0;  /* stack for comp that use buffers */
+static char **compbuffers = NULL;  /* buffers for component text */
+static struct comp **used_buf = NULL;  /* stack for comp that use buffers */
 
 static int dat[5];  /* aux. data for format routine */
 
-char *scanl = 0;  /* text of most recent scanline */
+char *scanl = NULL;  /* text of most recent scanline */
 
 #define DIEWRERR() adios(scnmsg, "write error on")
 
 #define FPUTS(buf) {\
-		if (mh_fputs(buf,scnout) == EOF)\
+		if (fputs(buf,scnout) == EOF)\
 			DIEWRERR();\
 	}
 
@@ -59,7 +59,6 @@ char *scanl = 0;  /* text of most recent scanline */
 ** prototypes
 */
 int sc_width(void);  /* from termsbr.c */
-static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
@@ -71,7 +70,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;
@@ -109,14 +108,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		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));
@@ -348,9 +339,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;
@@ -361,16 +349,5 @@ finished:
 	if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
 		DIEWRERR();
 
-	return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
-}
-
-static int
-mh_fputs(char *s, FILE *stream)
-{
-	char c;
-
-	while ((c = *s++))
-		if (putc(c,stream) == EOF )
-			return(EOF);
-	return (0);
+	return (state != FILEEOF ? SCNERR : SCNMSG);
 }