mhshowsbr.c: Delete single-use global int `nolist'.

[nmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 52343f75ad526b30e997f6fe5418526ac01bdfab..b999378bc4c6182195c7e8ad600daf21d233dad7 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,17 @@
  */
 
 #include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/dtime.h"
+#include "scansbr.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
@@ -18,7 +29,6 @@
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
-#include "h/scansbr.h"
 #include "h/tws.h"
 #include "h/mts.h"
 #include "h/done.h"
@@ -66,6 +76,7 @@ main (int argc, char **argv)
     char **argp, *nfs, **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
+    charstring_t scanl = NULL;
     FILE *in;
 
     if (nmh_init(argv[0], true, true)) { return 1; }
@@ -180,14 +191,14 @@ main (int argc, char **argv)
 
        scan_detect_mbox_style (in);
        for (msgnum = 1; ; ++msgnum) {
-           charstring_t scanl = NULL;
-
            state = scan (in, msgnum, -1, nfs, width, 0, 0,
                          hdrflag ? file : NULL, 0L, 1, &scanl);
-           charstring_free (scanl);
+           if (scanl)
+               charstring_clear(scanl);
            if (state != SCNMSG && state != SCNENC)
                break;
        }
+       charstring_free (scanl);
        scan_finished ();
        fclose (in);
        done (0);
@@ -246,7 +257,6 @@ main (int argc, char **argv)
         (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
         msgnum += (revflag ? -1 : 1)) {
        if (is_selected(mp, msgnum)) {
-           charstring_t scanl = NULL;
 
            if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) {
                    admonish (cp, "unable to open message");
@@ -284,7 +294,8 @@ main (int argc, char **argv)
                    inform("message %d: empty", msgnum);
                    break;
            }
-           charstring_free (scanl);
+           if (scanl)
+               charstring_clear(scanl);
            scan_finished ();
            hdrflag = false;
            fclose (in);
@@ -292,6 +303,7 @@ main (int argc, char **argv)
                fflush (stdout);
        }
     }
+    charstring_free (scanl);
 
     ivector_free (seqnum);
     folder_free (mp);  /* free folder/message structure */