From c59c42e166563def6e17c388464de21309212cb9 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 12 Jul 2005 14:58:25 +0000 Subject: don't declare variables inside a code block (bug #4681) fix formatting git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6104 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- say.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'say.c') diff --git a/say.c b/say.c index 76dba3986..4ea7595e9 100755 --- a/say.c +++ b/say.c @@ -3618,13 +3618,10 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t time, /* Shorthand for "" (today), "Yesterday", A * (weekday), or "date" */ { - char todo='q';/* The letter to format*/ - if (format[offset] == 'Q') { - todo='Q'; - } struct timeval now; struct tm tmnow; time_t beg_today; + char todo = format[offset]; /* The letter to format*/ gettimeofday(&now,NULL); ast_localtime(&now.tv_sec,&tmnow,timezone); @@ -3635,9 +3632,9 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t time, /* Today */ if (todo == 'Q') { res = wait_file(chan, - ints, - "digits/today", - lang); + ints, + "digits/today", + lang); } } else if (beg_today - 86400 < time) { /* Yesterday */ @@ -3646,13 +3643,13 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t time, (beg_today - 86400 * 6 < time)) { /* Within the last week */ - res = ast_say_date_with_format_he( - chan, time, ints, lang, - "A", timezone); + res = ast_say_date_with_format_he(chan, + time, ints, lang, + "A", timezone); } else { - res = ast_say_date_with_format_he( - chan, time, ints, lang, - IL_DATE_STR, timezone); + res = ast_say_date_with_format_he(chan, + time, ints, lang, + IL_DATE_STR, timezone); } } break; -- cgit v1.2.3