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

Whitespace cleanup

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286342 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2010-09-11 17:35:15 +00:00
parent 3335c96157
commit cc64448e2f
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/app.c
View File

@@ -914,8 +914,9 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
totalsilence += dspsilence; totalsilence += dspsilence;
} }
if (totalsilence > 0) if (totalsilence > 0) {
*duration -= (totalsilence - 200) / 1000; *duration -= (totalsilence - 200) / 1000;
}
if (*duration < 0) { if (*duration < 0) {
*duration = 0; *duration = 0;
} }
@@ -929,7 +930,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
* to trim ANY part of the recording. * to trim ANY part of the recording.
*/ */
if (res > 0 && dspsilence) { if (res > 0 && dspsilence) {
/* rewind only the trailing silence */ /* rewind only the trailing silence */
ast_stream_rewind(others[x], dspsilence - 200); ast_stream_rewind(others[x], dspsilence - 200);
} }
ast_truncstream(others[x]); ast_truncstream(others[x]);

24
main/say.c
View File

@@ -3725,7 +3725,7 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
case 'Y': case 'Y':
/* Year */ /* Year */
if (tm.tm_year > 99) { if (tm.tm_year > 99) {
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
} else if (tm.tm_year < 1) { } else if (tm.tm_year < 1) {
/* I'm not going to handle 1900 and prior */ /* I'm not going to handle 1900 and prior */
/* We'll just be silent on the year, instead of bombing out. */ /* We'll just be silent on the year, instead of bombing out. */
@@ -4559,13 +4559,13 @@ int ast_say_date_with_format_he(struct ast_channel *chan, time_t t, const char *
break; break;
case 'd': case 'd':
case 'e': /* Day of the month */ case 'e': /* Day of the month */
/* I'm not sure exactly what the parameters /* I'm not sure exactly what the parameters
* audiofd and ctrlfd to * audiofd and ctrlfd to
* ast_say_number_full_he mean, but it seems * ast_say_number_full_he mean, but it seems
* safe to pass -1 there. * safe to pass -1 there.
* *
* At least in one of the pathes :-( * At least in one of the pathes :-(
*/ */
res = ast_say_number_full_he(chan, tm.tm_mday, ints, lang, "m", -1, -1); res = ast_say_number_full_he(chan, tm.tm_mday, ints, lang, "m", -1, -1);
break; break;
case 'Y': /* Year */ case 'Y': /* Year */
@@ -5225,7 +5225,7 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
break; break;
case 'R': case 'R':
res = ast_say_date_with_format_it(chan, t, ints, lang, "HM", tzone); res = ast_say_date_with_format_it(chan, t, ints, lang, "HM", tzone);
break; break;
case 'S': case 'S':
/* Seconds */ /* Seconds */
if (tm.tm_sec == 0) { if (tm.tm_sec == 0) {
@@ -5254,7 +5254,7 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
} }
} }
} }
break; break;
case 'T': case 'T':
res = ast_say_date_with_format_it(chan, t, ints, lang, "HMS", tzone); res = ast_say_date_with_format_it(chan, t, ints, lang, "HMS", tzone);
break; break;
@@ -7703,7 +7703,7 @@ int ast_say_date_with_format_vi(struct ast_channel *chan, time_t t, const char *
case 'Y': case 'Y':
/* Year */ /* Year */
if (tm.tm_year > 99) { if (tm.tm_year > 99) {
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
} else if (tm.tm_year < 1) { } else if (tm.tm_year < 1) {
/* I'm not going to handle 1900 and prior */ /* I'm not going to handle 1900 and prior */
/* We'll just be silent on the year, instead of bombing out. */ /* We'll just be silent on the year, instead of bombing out. */
@@ -8263,7 +8263,7 @@ static const char *counted_noun_ending_en(int num)
*/ */
static const char *counted_noun_ending_slavic(int num) static const char *counted_noun_ending_slavic(int num)
{ {
if (num < 0) { if (num < 0) {
num *= -1; num *= -1;
} }
num %= 100; /* never pay attention to more than two digits */ num %= 100; /* never pay attention to more than two digits */