fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/apoint.c: Remove several unneeded variables

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-12-05 00:43:17 +01:00
parent fc9cd6149b
commit dfe835190f
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/apoint.c
View File

@ -268,57 +268,51 @@ apoint_delete (unsigned *nb_events, unsigned *nb_apoints)
char *del_app_str = _("Do you really want to delete this item ?"); char *del_app_str = _("Do you really want to delete this item ?");
long date; long date;
int nb_items = *nb_apoints + *nb_events; int nb_items = *nb_apoints + *nb_events;
unsigned go_for_deletion = 0;
int to_be_removed = 0; int to_be_removed = 0;
int answer = 0;
int deleted_item_type = 0;
date = calendar_get_slctd_day_sec (); date = calendar_get_slctd_day_sec ();
if (nb_items == 0)
return;
if (conf.confirm_delete) if (conf.confirm_delete)
{ {
status_mesg (del_app_str, choices); status_mesg (del_app_str, choices);
answer = wgetch (win[STA].p); if (wgetch (win[STA].p) != 'y')
if ((answer == 'y') && (nb_items != 0))
go_for_deletion = 1;
else
{ {
wins_erase_status_bar (); wins_erase_status_bar ();
return; return;
} }
} }
else if (nb_items != 0)
go_for_deletion = 1;
if (go_for_deletion) if (nb_items != 0)
{ {
if (nb_items != 0) switch (day_erase_item (date, hilt, ERASE_DONT_FORCE))
{ {
deleted_item_type = day_erase_item (date, hilt, ERASE_DONT_FORCE); case EVNT:
if (deleted_item_type == EVNT || deleted_item_type == RECUR_EVNT) case RECUR_EVNT:
{ (*nb_events)--;
(*nb_events)--; to_be_removed = 1;
to_be_removed = 1; break;
} case APPT:
else if (deleted_item_type == APPT || deleted_item_type == RECUR_APPT) case RECUR_APPT:
{ (*nb_apoints)--;
(*nb_apoints)--; to_be_removed = 3;
to_be_removed = 3; break;
} case 0:
else if (deleted_item_type == 0)
return; return;
else default:
EXIT (_("no such type")); EXIT (_("no such type"));
/* NOTREACHED */ /* NOTREACHED */
}
if (hilt > 1) if (hilt > 1)
hilt--; hilt--;
if (apad.first_onscreen >= to_be_removed) if (apad.first_onscreen >= to_be_removed)
apad.first_onscreen = apad.first_onscreen - to_be_removed; apad.first_onscreen = apad.first_onscreen - to_be_removed;
if (nb_items == 1) if (nb_items == 1)
hilt = 0; hilt = 0;
} }
}
} }
/* Cut an item, so that it can be pasted somewhere else later. */ /* Cut an item, so that it can be pasted somewhere else later. */