From: David Levine <levinedl@acm.org>
Date: Wed, 12 Dec 2012 05:24:19 +0000 (-0600)
Subject: Removed a few #ifndef JLR/#endif pairs because they're not needed.
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=a59946091a8ee121ad89708efb0b719e0d1e179a

Removed a few #ifndef JLR/#endif pairs because they're not needed.
---

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 3818b85..ac4d23a 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -994,7 +994,7 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat)
 	}
 	fmt++;
     }
-#ifndef JLR
+
     /* Emit any trailing sequences of zero display length. */
     while (fmt->f_type != FT_DONE) {
 	if (fmt->f_type == FT_LS_LIT) {
@@ -1021,15 +1021,4 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat)
     }
     *cp = '\0';
     return ((struct format *)0);
-#else /* JLR */
-    if (cp[-1] != '\n')
-	*cp++ = '\n';
-    while (fmt->f_type != FT_DONE)
-	fmt++;
-
-    finished:;
-    *cp = '\0';
-    return (fmt->f_value ? ++fmt : (struct format *) 0);
-
-#endif /* JLR */
 }
diff --git a/uip/scan.c b/uip/scan.c
index b22297f..08c893b 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -184,11 +184,9 @@ main (int argc, char **argv)
 		adios (file, "unable to open");
 	}
 
-#ifndef	JLR
 	if (hdrflag) {
 	    printf ("FOLDER %s\t%s\n", file, dtimenow (1));
 	}
-#endif /* JLR */
 
 	m_unknown (in);
 	for (msgnum = 1; ; ++msgnum) {
@@ -265,11 +263,9 @@ main (int argc, char **argv)
 		continue;
 	    }
 
-#ifndef JLR
 	    if (hdrflag) {
 		printf ("FOLDER %s\t%s\n", folder, dtimenow(1));
 	    }
-#endif /* JLR */
 
 	    /*
 	     * Check if message is in any sequence given