From b38be992b181d135f18ae833158385a27618b7af Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 23 Jan 2015 19:51:42 +0000
Subject: [PATCH] app_confbridge: Whitespace
Because there is sometimes no sence to any whitespace.
........
Merged revisions 431049 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 431050 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_confbridge.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index b5d48452d4..8601a32a4e 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -557,31 +557,33 @@ static void send_unmute_event(struct confbridge_user *user, struct confbridge_co
static void set_rec_filename(struct confbridge_conference *conference, struct ast_str **filename, int is_new)
{
char *rec_file = conference->b_profile.rec_file;
- time_t now;
char *ext;
+ time_t now;
- if (ast_str_strlen(*filename) && ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) && !is_new) {
- return;
+ if (ast_str_strlen(*filename)
+ && ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND)
+ && !is_new) {
+ return;
}
time(&now);
ast_str_reset(*filename);
if (ast_strlen_zero(rec_file)) {
- ast_str_set(filename, 0, "confbridge-%s-%u.wav", conference->name, (unsigned int)now);
+ ast_str_set(filename, 0, "confbridge-%s-%u.wav", conference->name,
+ (unsigned int) now);
} else if (ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_TIMESTAMP)) {
/* insert time before file extension */
ext = strrchr(rec_file, '.');
if (ext) {
ast_str_set_substr(filename, 0, rec_file, ext - rec_file);
- ast_str_append(filename, 0, "-%u%s", (unsigned int)now, ext);
+ ast_str_append(filename, 0, "-%u%s", (unsigned int) now, ext);
} else {
- ast_str_set(filename, 0, "%s-%u", rec_file, (unsigned int)now);
+ ast_str_set(filename, 0, "%s-%u", rec_file, (unsigned int) now);
}
} else {
ast_str_set(filename, 0, "%s", rec_file);
}
-
ast_str_append(filename, 0, ",%s%s,%s",
ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) ? "a" : "",
conference->b_profile.rec_options,
--
GitLab