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 3818b85e30cbe5a4d6af139fb4e3b7d4cba0fa28..ac4d23afdedd7a9ad496a861ccd04f23c27d9e07 100644 (file)
--- 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++;
     }
        }
        fmt++;
     }

-#ifndef JLR
+

     /* Emit any trailing sequences of zero display length. */
     while (fmt->f_type != FT_DONE) {
        if (fmt->f_type == FT_LS_LIT) {
     /* 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);
     }
     *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 b22297f87555b015a1d5864039de00060ac3aa92..08c893b33211b00b8660c1b2b1f336613017e465 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -184,11 +184,9 @@ main (int argc, char **argv)
                adios (file, "unable to open");
        }
 
                adios (file, "unable to open");
        }
 

-#ifndef        JLR

        if (hdrflag) {
            printf ("FOLDER %s\t%s\n", file, dtimenow (1));
        }
        if (hdrflag) {
            printf ("FOLDER %s\t%s\n", file, dtimenow (1));
        }

-#endif /* JLR */

 
        m_unknown (in);
        for (msgnum = 1; ; ++msgnum) {
 
        m_unknown (in);
        for (msgnum = 1; ; ++msgnum) {


@@ -265,11 +263,9 @@ main (int argc, char **argv)
                continue;
            }
 
                continue;
            }
 

-#ifndef JLR

            if (hdrflag) {
                printf ("FOLDER %s\t%s\n", folder, dtimenow(1));
            }
            if (hdrflag) {
                printf ("FOLDER %s\t%s\n", folder, dtimenow(1));
            }

-#endif /* JLR */

 
            /*
             * Check if message is in any sequence given
 
            /*
             * Check if message is in any sequence given