diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
| commit | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_playback.c | |
| parent | 1013afa1ad09d854207d24d3aed691321fecc100 (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_playback.c')
| -rw-r--r-- | apps/app_playback.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_playback.c b/apps/app_playback.c index 561600ad4..356d325b4 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -275,16 +275,16 @@ static int say_enumeration_full(struct ast_channel *chan, int num, } static int say_date_generic(struct ast_channel *chan, time_t t, - const char *ints, const char *lang, const char *format, const char *timezone, const char *prefix) + const char *ints, const char *lang, const char *format, const char *timezonename, const char *prefix) { char buf[128]; struct ast_tm tm; - struct timeval tv = { t, 0 }; + struct timeval when = { t, 0 }; say_args_t a = { chan, ints, lang, -1, -1 }; if (format == NULL) format = ""; - ast_localtime(&tv, &tm, NULL); + ast_localtime(&when, &tm, NULL); snprintf(buf, sizeof(buf), "%s:%s:%04d%02d%02d%02d%02d.%02d-%d-%3d", prefix, format, @@ -300,9 +300,9 @@ static int say_date_generic(struct ast_channel *chan, time_t t, } static int say_date_with_format(struct ast_channel *chan, time_t t, - const char *ints, const char *lang, const char *format, const char *timezone) + const char *ints, const char *lang, const char *format, const char *timezonename) { - return say_date_generic(chan, t, ints, lang, format, timezone, "datetime"); + return say_date_generic(chan, t, ints, lang, format, timezonename, "datetime"); } static int say_date(struct ast_channel *chan, time_t t, const char *ints, const char *lang) |