factor out Context from mutt_check_rescore()

diff --git a/index.c b/index.c
index e8f16dd82618f4b50d24407a61873221ab1340a5..ee546355597d343899d0317d61c9e6b35e9f231e 100644 (file)
--- a/index.c
+++ b/index.c
@@ -3013,7 +3013,7 @@ int mutt_index_menu(void)
       case OP_ENTER_COMMAND:
 
         mutt_enter_command();
-        mutt_check_rescore(Context);
+        mutt_check_rescore(Context->mailbox);
         break;
 
       case OP_EDIT_OR_VIEW_RAW_MESSAGE:

diff --git a/score.c b/score.c
index ed198a1449eae40a8f6ce6fbf3a485f57462f181..9069d9559b5c2676a3be72a15846ccda7a1d4e21 100644 (file)
--- a/score.c
+++ b/score.c
@@ -59,9 +59,9 @@ static struct Score *ScoreList = NULL;
 
 /**
  * mutt_check_rescore - Do the emails need to have their scores recalculated?
- * @param ctx Mailbox
+ * @param m Mailbox
  */
-void mutt_check_rescore(struct Context *ctx)
+void mutt_check_rescore(struct Mailbox *m)
 {
   if (OptNeedRescore && Score)
   {
@@ -76,10 +76,10 @@ void mutt_check_rescore(struct Context *ctx)
     mutt_menu_set_redraw_full(MENU_MAIN);
     mutt_menu_set_redraw_full(MENU_PAGER);
 
-    for (int i = 0; ctx && i < ctx->mailbox->msg_count; i++)
+    for (int i = 0; m && i < m->msg_count; i++)
     {
-      mutt_score_message(ctx->mailbox, ctx->mailbox->hdrs[i], true);
-      ctx->mailbox->hdrs[i]->pair = 0;
+      mutt_score_message(m, m->hdrs[i], true);
+      m->hdrs[i]->pair = 0;
     }
   }
   OptNeedRescore = false;

diff --git a/score.h b/score.h
index f1fd74d0b94bb13d62d1efbff8337399f1d68f8f..2f054cba700a22bc393478f42483f07a0ef9eace 100644 (file)
--- a/score.h
+++ b/score.h
@@ -26,7 +26,6 @@
 #include <stdbool.h>
 
 struct Buffer;
-struct Context;
 struct Email;
 struct Mailbox;
 
@@ -35,7 +34,7 @@ extern short ScoreThresholdDelete;
 extern short ScoreThresholdFlag;
 extern short ScoreThresholdRead;
 
-void mutt_check_rescore(struct Context *ctx);
+void mutt_check_rescore(struct Mailbox *m);
 int  mutt_parse_score(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
 int  mutt_parse_unscore(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
 void mutt_score_message(struct Mailbox *m, struct Email *e, bool upd_ctx);