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
changes/42/42/1
Richard Mudgett 11 years ago
parent 89610adda5
commit b38be992b1

@ -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) static void set_rec_filename(struct confbridge_conference *conference, struct ast_str **filename, int is_new)
{ {
char *rec_file = conference->b_profile.rec_file; char *rec_file = conference->b_profile.rec_file;
time_t now;
char *ext; char *ext;
time_t now;
if (ast_str_strlen(*filename) && ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) && !is_new) { if (ast_str_strlen(*filename)
return; && ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND)
&& !is_new) {
return;
} }
time(&now); time(&now);
ast_str_reset(*filename); ast_str_reset(*filename);
if (ast_strlen_zero(rec_file)) { 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)) { } else if (ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_TIMESTAMP)) {
/* insert time before file extension */ /* insert time before file extension */
ext = strrchr(rec_file, '.'); ext = strrchr(rec_file, '.');
if (ext) { if (ext) {
ast_str_set_substr(filename, 0, rec_file, ext - rec_file); 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 { } 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 { } else {
ast_str_set(filename, 0, "%s", rec_file); ast_str_set(filename, 0, "%s", rec_file);
} }
ast_str_append(filename, 0, ",%s%s,%s", ast_str_append(filename, 0, ",%s%s,%s",
ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) ? "a" : "", ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) ? "a" : "",
conference->b_profile.rec_options, conference->b_profile.rec_options,

Loading…
Cancel
Save