Avoid implicit conversion between bool and quadopt

Make the conversion between `bool and `QuadOption` explicit, and avoid
depending on the underlying `enum` value.

Also state that `mutt_yesorno` works correctly for `MUTT_YES` and `MUTT_NO`

diff --git a/curs_lib.c b/curs_lib.c
index b06c71a644aa1ae8b3254f39cd896db8bc9d8fe1..2c636e0d1ccfd24178038ced22467c6fe206cf9c 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -326,7 +326,7 @@ void mutt_edit_file(const char *editor, const char *file)
 /**
  * mutt_yesorno - Ask the user a Yes/No question
  * @param msg Prompt
- * @param def Default answer, see #QuadOption
+ * @param def Default answer, #MUTT_YES or #MUTT_NO (see #QuadOption)
  * @retval num Selection made, see #QuadOption
  */
 enum QuadOption mutt_yesorno(const char *msg, enum QuadOption def)

diff --git a/init.c b/init.c
index c882ee91bd1c8ef492c152a2a67ddd630c646eaa..fe0b29c846bf9c22397be6dd7a818c7026669a2e 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3327,7 +3327,7 @@ enum QuadOption query_quadoption(enum QuadOption opt, const char *prompt)
       return opt;
 
     default:
-      opt = mutt_yesorno(prompt, (opt == MUTT_ASKYES));
+      opt = mutt_yesorno(prompt, (opt == MUTT_ASKYES) ? MUTT_YES : MUTT_NO);
       mutt_window_clearline(MuttMessageWindow, 0);
       return opt;
   }