diff options
| author | Lukas Fleischer <lfleischer@calcurse.org> | 2016-09-30 17:54:45 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2016-10-01 09:00:23 +0200 |
| commit | 1003be18dfbf05d0748214711ae8723bceb374c7 (patch) | |
| tree | 25e5893327763cd0f636dba309d031981784c459 /src | |
| parent | 1af9ccccd79fa053dc5eb51f98e0bc1bd6f7d2b5 (diff) | |
| download | calcurse-1003be18dfbf05d0748214711ae8723bceb374c7.tar.gz calcurse-1003be18dfbf05d0748214711ae8723bceb374c7.zip | |
Refactor day_edit_time()
Make the function more flexible by returning the updated time instead of
single hour and minute components.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui-day.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/ui-day.c b/src/ui-day.c index 1956a7f..c094031 100644 --- a/src/ui-day.c +++ b/src/ui-day.c @@ -59,8 +59,7 @@ void ui_day_set_selitem(struct day_item *day) } /* Request the user to enter a new time. */ -static int day_edit_time(int time, unsigned *new_hour, - unsigned *new_minute) +static int day_edit_time(int time) { char *timestr = date_sec2date_str(time, "%H:%M"); const char *msg_time = @@ -68,15 +67,16 @@ static int day_edit_time(int time, unsigned *new_hour, const char *enter_str = _("Press [Enter] to continue"); const char *fmt_msg = _("You entered an invalid time, should be [hh:mm] or [hhmm]"); + int hour, minute; for (;;) { status_mesg(msg_time, ""); if (updatestring(win[STA].p, ×tr, 0, 1) != GETSTRING_VALID) return 0; - if (parse_time(timestr, new_hour, new_minute) == 1) { + if (parse_time(timestr, &hour, &minute) == 1) { mem_free(timestr); - return 1; + return update_time_in_date(time, hour, minute); } else { status_mesg(fmt_msg, enter_str); wgetch(win[KEY].p); @@ -131,20 +131,19 @@ static int day_edit_duration(int start, int dur, unsigned *new_duration) static void update_start_time(long *start, long *dur, int update_dur) { long newtime; - unsigned hr, mn; int valid_date; const char *msg_wrong_time = _("Invalid time: start time must be before end time!"); const char *msg_enter = _("Press [Enter] to continue"); do { - if (!day_edit_time(*start, &hr, &mn)) + newtime = day_edit_time(*start); + if (!newtime) break; if (!update_dur) { - *start = update_time_in_date(*start, hr, mn); + *start = newtime; return; } - newtime = update_time_in_date(*start, hr, mn); if (newtime < *start + *dur) { *dur -= (newtime - *start); *start = newtime; |