* update mu_date_str_to_time_t for macos

at macos this function /seemed/ to massively leak, when looking at the
  valgrind output on macos (but not linux). with this update, this
  leak(?) is gone.
This commit is contained in:
djcb
2013-09-07 13:12:28 +03:00
parent 827dfbecdb
commit af55f4cf9e

View File

@ -223,13 +223,14 @@ time_t
mu_date_str_to_time_t (const char* date, gboolean local) mu_date_str_to_time_t (const char* date, gboolean local)
{ {
struct tm tm; struct tm tm;
char mydate[14 + 1]; /* YYYYMMDDHHMMSS */ char tzbuf[16], mydate[14 + 1]; /* YYYYMMDDHHMMSS */
char *oldtz;
time_t t; time_t t;
char oldtz[16];
memset (&tm, 0, sizeof(struct tm)); memset (&tm, 0, sizeof(struct tm));
strncpy (mydate, date, 15); strncpy (mydate, date, 15);
mydate[sizeof(mydate)-1]='\0'; mydate[sizeof(mydate)-1]='\0';
oldtz = tzbuf;
g_return_val_if_fail (date, (time_t)-1); g_return_val_if_fail (date, (time_t)-1);
@ -249,8 +250,9 @@ mu_date_str_to_time_t (const char* date, gboolean local)
setenv ("TZ", "", 1); setenv ("TZ", "", 1);
tzset (); tzset ();
} else } else
local = TRUE; /* already */ oldtz = NULL;
} } else
oldtz = NULL;
t = mktime (&tm); t = mktime (&tm);