handle hghsel lowsel and numsel in (un)set_selected

Now you can use this funkitions without taking care
of this values.

Thanks c_14 for reporting this bug.

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 4cc8d6c65a49b739288cb4806f09ac2efc9dee68..e14c7099d69099a494a29cb3cd23212df598d898 100644 (file)
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -87,20 +87,6 @@ folder_addmsg(struct msgs **mpp, char *msgfile, int selected,
                /* should we set the SELECTED bit? */
                if (selected) {
                        set_selected(mp, msgnum);
-
-                       /* check if highest or lowest selected */
-                       if (mp->numsel == 0) {
-                               mp->lowsel = msgnum;
-                               mp->hghsel = msgnum;
-                       } else {
-                               if (msgnum < mp->lowsel)
-                                       mp->lowsel = msgnum;
-                               if (msgnum > mp->hghsel)
-                                       mp->hghsel = msgnum;
-                       }
-
-                       /* increment number selected */
-                       mp->numsel++;
                }
 
                /*

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 8e5fd0a2e9401e7bba01e302f3c4ee377eac291e..3165883837153424441fb7f800eba8b486373c69 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -28,7 +28,6 @@ folder_delmsgs(struct msgs *mp, int hook)
 
                /* unselect message */
                unset_selected(mp, msgnum);
-               mp->numsel--;
 
                snprintf(msgpath, sizeof (msgpath), "%s/%d",
                                mp->foldpath, msgnum);

diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index f113366c007c68624b52e5806ef4a4ff87b026d4..0a4756817e0281095b0fe846e61164f37257bad5 100644 (file)
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -44,13 +44,6 @@ addtosel(struct msgs *mp, int msg)
                return;  /* dont select twice */
        }
        set_selected(mp, msg);
-       mp->numsel++;
-       if (mp->lowsel == 0 || msg < mp->lowsel) {
-               mp->lowsel = msg;
-       }
-       if (msg > mp->hghsel) {
-               mp->hghsel = msg;
-       }
 }
 
 int

diff --git a/sbr/seq_msgstats.c b/sbr/seq_msgstats.c
index eb483b7bd194d990af06fa7beb4d105be1a4c4d7..6b89d70554b7a20d9de936f3186af0330c13b85b 100644 (file)
--- a/sbr/seq_msgstats.c
+++ b/sbr/seq_msgstats.c
@@ -99,6 +99,13 @@ set_selected(struct msgs *mp, int msgnum)
 {
        assert_msg_range(mp, msgnum);
        mp->msgstats[msgnum - mp->lowoff] |= SELECTED;
+       if (mp->lowsel == 0 || msgnum < mp->lowsel) {
+               mp->lowsel = msgnum;
+       }
+       if (msgnum > mp->hghsel) {
+               mp->hghsel = msgnum;
+       }
+       mp->numsel++;
 }
 
 void
@@ -120,6 +127,9 @@ unset_selected(struct msgs *mp, int msgnum)
 {
        assert_msg_range(mp, msgnum);
        mp->msgstats[msgnum - mp->lowoff] &= ~SELECTED;
+       if (mp->numsel > 0) {
+               mp->numsel--;
+       }
 }
 
 void

diff --git a/uip/pick.c b/uip/pick.c
index 984d80bdf20bf4581ce47ff78bdc962bd10cac1e..2d2bd6505c49385a0909e92bdbd390e2abc33389 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -274,7 +274,6 @@ main(int argc, char **argv)
                        } else {
                                /* if it doesn't match, then unselect it */
                                unset_selected(mp, msgnum);
-                               mp->numsel--;
                        }
                        if (fp)
                                fclose(fp);