kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not use a variable name that hides a useful library symbol (time())

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-05-09 11:27:33 +00:00
parent 10187179fb
commit b475987295
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
say.c
View File

@@ -4656,13 +4656,13 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t time, const cha
} }
/* Polish syntax */ /* Polish syntax */
int ast_say_date_with_format_pl(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone) int ast_say_date_with_format_pl(struct ast_channel *chan, time_t thetime, const char *ints, const char *lang, const char *format, const char *timezone)
{ {
struct tm tm; struct tm tm;
int res=0, offset, sndoffset; int res=0, offset, sndoffset;
char sndfile[256], nextmsg[256]; char sndfile[256], nextmsg[256];
ast_localtime(&time,&tm,timezone); ast_localtime(&thetime, &tm, timezone);
for (offset = 0 ; format[offset] != '\0' ; offset++) { for (offset = 0 ; format[offset] != '\0' ; offset++) {
int remainder; int remainder;
@@ -4780,53 +4780,51 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t time, const cha
case 'Q': case 'Q':
/* Shorthand for "Today", "Yesterday", or AdBY */ /* Shorthand for "Today", "Yesterday", or AdBY */
{ {
struct timeval now; time_t tv_sec = time(NULL);
struct tm tmnow; struct tm tmnow;
time_t beg_today; time_t beg_today;
gettimeofday(&now, NULL); ast_localtime(&tv_sec,&tmnow, timezone);
ast_localtime(&now.tv_sec,&tmnow, timezone);
/* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
/* In any case, it saves not having to do ast_mktime() */ /* In any case, it saves not having to do ast_mktime() */
beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); beg_today = tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
if (beg_today < time) { if (beg_today < thetime) {
/* Today */ /* Today */
res = wait_file(chan, ints, "digits/today", lang); res = wait_file(chan, ints, "digits/today", lang);
} else if (beg_today - 86400 < time) { } else if (beg_today - 86400 < thetime) {
/* Yesterday */ /* Yesterday */
res = wait_file(chan, ints, "digits/yesterday", lang); res = wait_file(chan, ints, "digits/yesterday", lang);
} else { } else {
res = ast_say_date_with_format(chan, time, ints, lang, "AdBY", timezone); res = ast_say_date_with_format(chan, thetime, ints, lang, "AdBY", timezone);
} }
} }
break; break;
case 'q': case 'q':
/* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */ /* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */
{ {
struct timeval now; time_t tv_sec = time(NULL);
struct tm tmnow; struct tm tmnow;
time_t beg_today; time_t beg_today;
gettimeofday(&now, NULL); ast_localtime(&tv_sec, &tmnow, timezone);
ast_localtime(&now.tv_sec, &tmnow, timezone);
/* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
/* In any case, it saves not having to do ast_mktime() */ /* In any case, it saves not having to do ast_mktime() */
beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); beg_today = tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
if (beg_today < time) { if (beg_today < thetime) {
/* Today */ /* Today */
} else if ((beg_today - 86400) < time) { } else if ((beg_today - 86400) < thetime) {
/* Yesterday */ /* Yesterday */
res = wait_file(chan, ints, "digits/yesterday", lang); res = wait_file(chan, ints, "digits/yesterday", lang);
} else if (beg_today - 86400 * 6 < time) { } else if (beg_today - 86400 * 6 < thetime) {
/* Within the last week */ /* Within the last week */
res = ast_say_date_with_format(chan, time, ints, lang, "A", timezone); res = ast_say_date_with_format(chan, thetime, ints, lang, "A", timezone);
} else { } else {
res = ast_say_date_with_format(chan, time, ints, lang, "AdBY", timezone); res = ast_say_date_with_format(chan, thetime, ints, lang, "AdBY", timezone);
} }
} }
break; break;
case 'R': case 'R':
res = ast_say_date_with_format(chan, time, ints, lang, "HM", timezone); res = ast_say_date_with_format(chan, thetime, ints, lang, "HM", timezone);
break; break;
case 'S': case 'S':
/* Seconds */ /* Seconds */
@@ -4852,7 +4850,7 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t time, const cha
} }
break; break;
case 'T': case 'T':
res = ast_say_date_with_format(chan, time, ints, lang, "HMS", timezone); res = ast_say_date_with_format(chan, thetime, ints, lang, "HMS", timezone);
break; break;
case ' ': case ' ':
case ' ': case ' ':