From 0145ba12ecb20583adda4e4b03dd5b7cfb15d1f4 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 24 Feb 2015 13:57:44 +0100 Subject: Use time_t instead of long in several places Start converting some variables and return values to store times from long to time_t. Signed-off-by: Lukas Fleischer --- src/calcurse.h | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src/calcurse.h') diff --git a/src/calcurse.h b/src/calcurse.h index ebb3eb8..a1b59cf 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -406,10 +406,10 @@ enum item_type { struct item_filter { int type_mask; regex_t *regex; - long start_from; - long start_to; - long end_from; - long end_to; + time_t start_from; + time_t start_to; + time_t end_from; + time_t end_to; int priority; int completed; int uncompleted; @@ -699,7 +699,7 @@ unsigned ui_calendar_week_begins_on_monday(void); void ui_calendar_store_current_date(struct date *); void ui_calendar_init_slctd_day(void); struct date *ui_calendar_get_slctd_day(void); -long ui_calendar_get_slctd_day_sec(void); +time_t ui_calendar_get_slctd_day_sec(void); void ui_calendar_monthly_view_cache_set_invalid(void); void ui_calendar_update_panel(void); void ui_calendar_goto_today(void); @@ -954,11 +954,9 @@ void recur_apoint_write(struct recur_apoint *, FILE *); void recur_event_write(struct recur_event *, FILE *); void recur_save_data(FILE *); unsigned recur_item_find_occurrence(long, long, llist_t *, int, - int, long, long, unsigned *); -unsigned recur_apoint_find_occurrence(struct recur_apoint *, long, - unsigned *); -unsigned recur_event_find_occurrence(struct recur_event *, long, - unsigned *); + int, long, long, time_t *); +unsigned recur_apoint_find_occurrence(struct recur_apoint *, long, time_t *); +unsigned recur_event_find_occurrence(struct recur_event *, long, time_t *); unsigned recur_item_inday(long, long, llist_t *, int, int, long, long); unsigned recur_apoint_inday(struct recur_apoint *, long *); unsigned recur_event_inday(struct recur_event *, long *); @@ -1053,17 +1051,17 @@ int is_all_digit(const char *); long get_item_time(long); int get_item_hour(long); int get_item_min(long); -long date2sec(struct date, unsigned, unsigned); -long utcdate2sec(struct date, unsigned, unsigned); +time_t date2sec(struct date, unsigned, unsigned); +time_t utcdate2sec(struct date, unsigned, unsigned); char *date_sec2date_str(long, const char *); void date_sec2date_fmt(long, const char *, char *); long date_sec_change(long, int, int); long update_time_in_date(long, unsigned, unsigned); -long get_sec_date(struct date); +time_t get_sec_date(struct date); long min2sec(unsigned); void draw_scrollbar(WINDOW *, int, int, int, int, int, unsigned); void item_in_popup(const char *, const char *, const char *, const char *); -long get_today(void); +time_t get_today(void); long now(void); char *nowstr(void); void print_bool_option_incolor(WINDOW *, unsigned, int, int); @@ -1083,8 +1081,7 @@ int child_wait(int *, int *, int); void press_any_key(void); void print_apoint(const char *, long, struct apoint *); void print_event(const char *, long, struct event *); -void print_recur_apoint(const char *, long, unsigned, - struct recur_apoint *); +void print_recur_apoint(const char *, long, time_t, struct recur_apoint *); void print_recur_event(const char *, long, struct recur_event *); void print_todo(const char *, struct todo *); int vasprintf(char **, const char *, va_list); -- cgit v1.2.3-54-g00ecf