aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-11 17:35:15 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-11 17:35:15 +0000
commitceec0c5a5f861453230b6f0720d1939ffdbdcfa4 (patch)
tree1718ebfcaf3d239cabdbed6e2e6f21fcd1eba96d
parentb51ed4da1b9a39a2449e2d55df2eb7d3b438773e (diff)
Whitespace cleanup
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@286342 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/app.c5
-rw-r--r--main/say.c24
2 files changed, 15 insertions, 14 deletions
diff --git a/main/app.c b/main/app.c
index e6ca51483..3a1cdc1bb 100644
--- a/main/app.c
+++ b/main/app.c
@@ -914,8 +914,9 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
totalsilence += dspsilence;
}
- if (totalsilence > 0)
+ if (totalsilence > 0) {
*duration -= (totalsilence - 200) / 1000;
+ }
if (*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.
*/
if (res > 0 && dspsilence) {
- /* rewind only the trailing silence */
+ /* rewind only the trailing silence */
ast_stream_rewind(others[x], dspsilence - 200);
}
ast_truncstream(others[x]);
diff --git a/main/say.c b/main/say.c
index 25805a1df..267137b8b 100644
--- a/main/say.c
+++ b/main/say.c
@@ -3725,7 +3725,7 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t t, const char *
case 'Y':
/* Year */
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) {
/* I'm not going to handle 1900 and prior */
/* 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;
case 'd':
case 'e': /* Day of the month */
- /* I'm not sure exactly what the parameters
- * audiofd and ctrlfd to
- * ast_say_number_full_he mean, but it seems
- * safe to pass -1 there.
- *
- * At least in one of the pathes :-(
- */
+ /* I'm not sure exactly what the parameters
+ * audiofd and ctrlfd to
+ * ast_say_number_full_he mean, but it seems
+ * safe to pass -1 there.
+ *
+ * At least in one of the pathes :-(
+ */
res = ast_say_number_full_he(chan, tm.tm_mday, ints, lang, "m", -1, -1);
break;
case 'Y': /* Year */
@@ -5225,7 +5225,7 @@ int ast_say_date_with_format_it(struct ast_channel *chan, time_t t, const char *
break;
case 'R':
res = ast_say_date_with_format_it(chan, t, ints, lang, "HM", tzone);
- break;
+ break;
case 'S':
/* Seconds */
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':
res = ast_say_date_with_format_it(chan, t, ints, lang, "HMS", tzone);
break;
@@ -7703,7 +7703,7 @@ int ast_say_date_with_format_vi(struct ast_channel *chan, time_t t, const char *
case 'Y':
/* Year */
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) {
/* I'm not going to handle 1900 and prior */
/* 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)
{
- if (num < 0) {
+ if (num < 0) {
num *= -1;
}
num %= 100; /* never pay attention to more than two digits */