Author: rmudgett Date: Fri Jan 23 13:44:48 2015 New Revision: 431050 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431050 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 Modified: branches/13/ (props changed) branches/13/apps/app_confbridge.c Propchange: branches/13/ ------------------------------------------------------------------------------ --- branch-11-merged (original) +++ branch-11-merged Fri Jan 23 13:44:48 2015 @@ -1,1 +1,1 @@ -/branches/11:1-429517,429539,429632,429783,429804,429825,429867,429893,429982,430009,430126,430415,430487,430506,430564,430589,430795,430798,430920,430993,430996,430997 +/branches/11:1-429517,429539,429632,429783,429804,429825,429867,429893,429982,430009,430126,430415,430487,430506,430564,430589,430795,430798,430920,430993,430996-430997,431049 Modified: branches/13/apps/app_confbridge.c URL: http://svnview.digium.com/svn/asterisk/branches/13/apps/app_confbridge.c?view=diff&rev=431050&r1=431049&r2=431050 ============================================================================== --- branches/13/apps/app_confbridge.c (original) +++ branches/13/apps/app_confbridge.c Fri Jan 23 13:44:48 2015 @@ -557,29 +557,31 @@ 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 { /* 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); + } + } if (ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND)) { ast_str_append(filename, 0, ",a"); } -- _____________________________________________________________________ -- 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
