patch-src_utils_c 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. $OpenBSD: patch-src_utils_c,v 1.3 2017/03/15 09:26:10 ajacoutot Exp $
  2. --- src/utils.c.orig Thu Jan 12 08:38:27 2017
  3. +++ src/utils.c Tue Mar 14 14:01:16 2017
  4. @@ -352,17 +352,19 @@ long get_item_time(long date)
  5. get_item_min(date) * MININSEC);
  6. }
  7. -int get_item_hour(long date)
  8. +int get_item_hour(long date_l)
  9. {
  10. struct tm lt;
  11. + time_t date = date_l;
  12. localtime_r((time_t *) & date, &lt);
  13. return lt.tm_hour;
  14. }
  15. -int get_item_min(long date)
  16. +int get_item_min(long date_l)
  17. {
  18. struct tm lt;
  19. + time_t date = date_l;
  20. localtime_r((time_t *) & date, &lt);
  21. return lt.tm_min;
  22. @@ -445,10 +447,11 @@ int date_cmp_day(time_t d1, time_t d2)
  23. }
  24. /* Return a string containing the date, given a date in seconds. */
  25. -char *date_sec2date_str(long sec, const char *datefmt)
  26. +char *date_sec2date_str(long sec_l, const char *datefmt)
  27. {
  28. struct tm lt;
  29. char *datestr = (char *)mem_calloc(BUFSIZ, sizeof(char));
  30. + time_t sec = sec_l;
  31. if (sec == 0) {
  32. strncpy(datestr, "0", BUFSIZ);
  33. @@ -461,8 +464,10 @@ char *date_sec2date_str(long sec, const char *datefmt)
  34. }
  35. /* Generic function to format date. */
  36. -void date_sec2date_fmt(long sec, const char *fmt, char *datef)
  37. +void date_sec2date_fmt(long sec_l, const char *fmt, char *datef)
  38. {
  39. + time_t sec = sec_l;
  40. +
  41. #if ENABLE_NLS
  42. /* TODO: Find a better way to deal with localization and strftime(). */
  43. char *locale_old = mem_strdup(setlocale(LC_ALL, NULL));