Removed (allmost all) JLR-specific code.

There still is one fragment in fmt_scan(), of which I don't understand
the logic. I don't want to remove stuff I don't understand.

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2609679..4a8da14 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -877,13 +877,14 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
                }
                fmt++;
        }
-#ifndef JLR
-       finished:;
+finished:;
        if (cp[-1] != '\n')
                *cp++ = '\n';
-       *cp   = 0;
+       *cp = '\0';
        return ((struct format *)0);
-#else /* JLR */
+
+#ifdef JLR
+       /* I'll remove this as soon as I understand what it does. --meillo */
        if (cp[-1] != '\n')
                *cp++ = '\n';
        while (fmt->f_type != FT_DONE)
@@ -892,6 +893,6 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
        finished:;
        *cp = '\0';
        return (fmt->f_value ? ++fmt : (struct format *) 0);
-
 #endif /* JLR */
+
 }

diff --git a/uip/scan.c b/uip/scan.c
index 6881c34..cb4bac4 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -175,12 +175,6 @@ 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) {
                        state = scan(in, msgnum, -1, nfs, width, 0, 0,
@@ -254,12 +248,6 @@ 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
                        ** by Unseen-Sequence profile entry.

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8e02e57..a43044c 100644 (file)
--- 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) */
@@ -107,9 +104,6 @@ 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");