diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f315d3d938e172538c80cf780e21f64995d9f719..3ec6e3e38f24ef116908c8c736a0c6dddb9d2b10 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2206,7 +2206,6 @@ static int user_set_muted_cb(void *obj, void *check_admin_arg, int flags) static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struct ast_flags64 *confflags, char *optargs[]) { struct ast_conf_user *user = NULL; - struct ast_conf_user *usr = NULL; int fd; struct dahdi_confinfo dahdic, dahdic_empty; struct ast_frame *f; @@ -3222,6 +3221,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc int keepplaying; int playednamerec; struct ao2_iterator user_iter; + struct ast_conf_user *usr = NULL; switch(dtmf) { case '1': /* *81 Roll call */ keepplaying = 1; @@ -3260,7 +3260,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } } user_iter = ao2_iterator_init(conf->usercontainer, 0); - while((user = ao2_iterator_next(&user_iter))) { + while((usr = ao2_iterator_next(&user_iter))) { if (ast_fileexists(usr->namerecloc, NULL, NULL)) { if (keepplaying && !ast_streamfile(chan, usr->namerecloc, chan->language)) { res = ast_waitstream(chan, AST_DIGIT_ANY); @@ -3270,7 +3270,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } playednamerec = 1; } - ao2_ref(user, -1); + ao2_ref(usr, -1); } ao2_iterator_destroy(&user_iter); if (keepplaying && playednamerec && !ast_streamfile(chan, "conf-roll-callcomplete", chan->language)) { @@ -3414,6 +3414,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc break; case '3': /* Eject last user */ { + struct ast_conf_user *usr = NULL; int max_no = 0; ao2_callback(conf->usercontainer, OBJ_NODATA, user_max_cmp, &max_no); menu_active = 0; @@ -3425,7 +3426,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } else { usr->adminflags |= ADMINFLAG_KICKME; } - ao2_ref(user, -1); + ao2_ref(usr, -1); ast_stopstream(chan); break; }