Removed redundant initialization of local variable tls.

[nmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 592cc0a4d2f9c22b4c9a030eaff723cba20cc640..b999378bc4c6182195c7e8ad600daf21d233dad7 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -5,13 +5,34 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/scansbr.h>
-#include <h/tws.h>
-#include <h/mts.h>
+#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"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/seq_getnum.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/mts.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 #include "sbr/terminal.h"
 
@@ -41,19 +62,24 @@ DEFINE_SWITCH_ARRAY(SCAN, switches);
 int
 main (int argc, char **argv)
 {
-    int clearflag = 0, hdrflag = 0, ontty;
-    int width = -1, revflag = 0;
+    bool clearflag = false;
+    bool hdrflag = false;
+    int ontty;
+    int width = -1;
+    bool revflag = false;
     int i, state, msgnum;
     ivector_t seqnum = ivector_create (0);
-    int unseen, num_unseen_seq = 0;
+    bool unseen;
+    int num_unseen_seq = 0;
     char *cp, *maildir, *file = NULL, *folder = NULL;
     char *form = NULL, *format = NULL, buf[BUFSIZ];
     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], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -81,10 +107,10 @@ main (int argc, char **argv)
                    done (0);
 
                case CLRSW: 
-                   clearflag++;
+                   clearflag = true;
                    continue;
                case NCLRSW: 
-                   clearflag = 0;
+                   clearflag = false;
                    continue;
 
                case FORMSW: 
@@ -99,10 +125,10 @@ main (int argc, char **argv)
                    continue;
 
                case HEADSW: 
-                   hdrflag++;
+                   hdrflag = true;
                    continue;
                case NHEADSW: 
-                   hdrflag = 0;
+                   hdrflag = false;
                    continue;
 
                case WIDTHSW: 
@@ -111,10 +137,10 @@ main (int argc, char **argv)
                    width = atoi (cp);
                    continue;
                case REVSW:
-                   revflag++;
+                   revflag = true;
                    continue;
                case NREVSW:
-                   revflag = 0;
+                   revflag = false;
                    continue;
 
                case FILESW:
@@ -165,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);
@@ -231,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");
@@ -246,10 +271,10 @@ main (int argc, char **argv)
             * Check if message is in any sequence given
             * by Unseen-Sequence profile entry.
             */
-           unseen = 0;
+           unseen = false;
            for (i = 0; i < num_unseen_seq; i++) {
                if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) {
-                   unseen = 1;
+                   unseen = true;
                    break;
                }
            }
@@ -269,14 +294,16 @@ main (int argc, char **argv)
                    inform("message %d: empty", msgnum);
                    break;
            }
-           charstring_free (scanl);
+           if (scanl)
+               charstring_clear(scanl);
            scan_finished ();
-           hdrflag = 0;
+           hdrflag = false;
            fclose (in);
            if (ontty)
                fflush (stdout);
        }
     }
+    charstring_free (scanl);
 
     ivector_free (seqnum);
     folder_free (mp);  /* free folder/message structure */