123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- $OpenBSD: patch-src_utils_c,v 1.3 2017/03/15 09:26:10 ajacoutot Exp $
- --- src/utils.c.orig Thu Jan 12 08:38:27 2017
- +++ src/utils.c Tue Mar 14 14:01:16 2017
- @@ -352,17 +352,19 @@ long get_item_time(long date)
- get_item_min(date) * MININSEC);
- }
-
- -int get_item_hour(long date)
- +int get_item_hour(long date_l)
- {
- struct tm lt;
- + time_t date = date_l;
-
- localtime_r((time_t *) & date, <);
- return lt.tm_hour;
- }
-
- -int get_item_min(long date)
- +int get_item_min(long date_l)
- {
- struct tm lt;
- + time_t date = date_l;
-
- localtime_r((time_t *) & date, <);
- return lt.tm_min;
- @@ -445,10 +447,11 @@ int date_cmp_day(time_t d1, time_t d2)
- }
-
- /* Return a string containing the date, given a date in seconds. */
- -char *date_sec2date_str(long sec, const char *datefmt)
- +char *date_sec2date_str(long sec_l, const char *datefmt)
- {
- struct tm lt;
- char *datestr = (char *)mem_calloc(BUFSIZ, sizeof(char));
- + time_t sec = sec_l;
-
- if (sec == 0) {
- strncpy(datestr, "0", BUFSIZ);
- @@ -461,8 +464,10 @@ char *date_sec2date_str(long sec, const char *datefmt)
- }
-
- /* Generic function to format date. */
- -void date_sec2date_fmt(long sec, const char *fmt, char *datef)
- +void date_sec2date_fmt(long sec_l, const char *fmt, char *datef)
- {
- + time_t sec = sec_l;
- +
- #if ENABLE_NLS
- /* TODO: Find a better way to deal with localization and strftime(). */
- char *locale_old = mem_strdup(setlocale(LC_ALL, NULL));
|