From 1d9c90bb18969faed7dc2e833c4b21949bd31bbb Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste--git@jonglez.org>
Date: Mon, 14 May 2012 12:38:22 +0200
Subject: Use status_ask_choice() where applicable

These cases make obvious candidates for factorisation.

Signed-off-by: Baptiste Jonglez <baptiste--git@jonglez.org>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
 src/day.c | 58 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

(limited to 'src/day.c')

diff --git a/src/day.c b/src/day.c
index b102705..8b7e87d 100644
--- a/src/day.c
+++ b/src/day.c
@@ -922,33 +922,40 @@ int
 day_erase_item (long date, int item_number, enum eraseflg flag)
 {
   struct day_item *p;
+
   const char *erase_warning =
       _("This item is recurrent. "
         "Delete (a)ll occurences or just this (o)ne ?");
+  const char *erase_choices = _("[ao]");
+  const int nb_erase_choices = 2;
+
   const char *note_warning =
       _("This item has a note attached to it. "
         "Delete (i)tem or just its (n)ote ?");
-  const char *note_choice = _("[i/n] ");
-  const char *erase_choice = _("[a/o] ");
-  int ch, ans;
+  const char *note_choices = _("[in]");
+  const int nb_note_choices = 2;
+  int ans;
   unsigned delete_whole;
 
-  ch = -1;
   p = day_get_item (item_number);
   if (flag == ERASE_DONT_FORCE)
     {
-      ans = 0;
       if (p->note == NULL)
-        ans = 'i';
-      while (ans != 'i' && ans != 'n')
+        ans = 1;
+      else
+        ans = status_ask_choice (note_warning, note_choices, nb_note_choices);
+
+      switch (ans)
         {
-          status_mesg (note_warning, note_choice);
-          ans = wgetch (win[STA].p);
+        case 1:
+          flag = ERASE_FORCE;
+          break;
+        case 2:
+          flag = ERASE_FORCE_ONLY_NOTE;
+          break;
+        default: /* User escaped */
+          return 0;
         }
-      if (ans == 'i')
-        flag = ERASE_FORCE;
-      else
-        flag = ERASE_FORCE_ONLY_NOTE;
     }
   if (p->type == EVNT)
     {
@@ -961,24 +968,23 @@ day_erase_item (long date, int item_number, enum eraseflg flag)
   else
     {
       if (flag == ERASE_FORCE_ONLY_NOTE)
-        ch = 'a';
-      while ((ch != 'a') && (ch != 'o') && (ch != KEY_GENERIC_CANCEL))
-        {
-          status_mesg (erase_warning, erase_choice);
-          ch = wgetch (win[STA].p);
-        }
-      if (ch == 'a')
+        ans = 1;
+      else
+        ans = status_ask_choice (erase_warning, erase_choices,
+                                 nb_erase_choices);
+
+      switch (ans)
         {
+        case 1:
           delete_whole = 1;
-        }
-      else if (ch == 'o')
-        {
+          break;
+        case 2:
           delete_whole = 0;
-        }
-      else
-        {
+          break;
+        default:
           return 0;
         }
+
       if (p->type == RECUR_EVNT)
         {
           recur_event_erase (date, day_item_nb (date, item_number, RECUR_EVNT),
-- 
cgit v1.2.3-54-g00ecf