Author: rmudgett Date: Fri Jan 23 13:51:42 2015 New Revision: 431051 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431051 Log: 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 Modified: trunk/ (props changed) trunk/apps/app_confbridge.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/apps/app_confbridge.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=431051&r1=431050&r2=431051 ============================================================================== --- trunk/apps/app_confbridge.c (original) +++ trunk/apps/app_confbridge.c Fri Jan 23 13:51:42 2015 @@ -557,31 +557,33 @@ 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 *ext; time_t now; - char *ext; - - 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, -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
