From 5fdba27ea22e1584759dd3c698922d8444c8eb2a Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 14 Jun 2007 22:09:20 +0000 Subject: Merged revisions 69392 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r69392 | kpfleming | 2007-06-14 16:50:40 -0500 (Thu, 14 Jun 2007) | 2 lines use ast_localtime() in every place localtime_r() was being used ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69405 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_minivm.c | 3 ++- apps/app_voicemail.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 6479f7c70..4960ecf99 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -715,8 +715,9 @@ static int get_date(char *s, int len) { struct tm tm; time_t t; + t = time(0); - localtime_r(&t,&tm); + ast_localtime(&t, &tm, NULL); return strftime(s, len, "%a %b %e %r %Z %Y", &tm); } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 710072d91..8b934fbd8 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2239,7 +2239,7 @@ static int get_date(char *s, int len) struct tm tm; time_t t; t = time(0); - localtime_r(&t,&tm); + ast_localtime(&t, &tm, NULL); return strftime(s, len, "%a %b %e %r %Z %Y", &tm); } @@ -4380,10 +4380,10 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v /* No internal variable parsing for now, so we'll comment it out for the time being */ #if 0 /* Set the DIFF_* variables */ - localtime_r(&t, &time_now); + ast_localtime(&t, &time_now, NULL); tv_now = ast_tvnow(); tnow = tv_now.tv_sec; - localtime_r(&tnow,&time_then); + ast_localtime(&tnow, &time_then, NULL); /* Day difference */ if (time_now.tm_year == time_then.tm_year) -- cgit v1.2.3