Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

app_meetme: compiler warning

Browse Source 
Fixed a compiler warning (errors in 'dev-mode') given by gcc version 4.8.1.
The one in app_meetme involved the 'sizeof-pointer-memaccess'
(see: http://gcc.gnu.org/gcc-4.8/porting_to.html) warning. Fixed so
it would no longer issue a warning and can compile again in 'dev-mode'.

Review: https://reviewboard.asterisk.org/r/3098/
........

Merged revisions 404742 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@404773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/61/61/1
Kevin Harwell 12 years ago
parent 0abb5b9e18
commit a8393e64bc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

11
apps/app_meetme.c
Unescape View File

@ -2631,7 +2631,8 @@ static void meetme_menu_admin(enum menu_modes *menu_mode, int *dtmf, struct ast_
* \param recordingtmp character buffer which may hold the name of the conference recording file * \param recordingtmp character buffer which may hold the name of the conference recording file
* \param dahdic dahdi configuration info used by the main conference loop * \param dahdic dahdi configuration info used by the main conference loop
*/ */
static void meetme_menu_admin_extended(enum menu_modes *menu_mode, int *dtmf, struct ast_conference *conf, struct ast_flags64 *confflags, struct ast_channel *chan, struct ast_conf_user *user, char *recordingtmp, struct dahdi_confinfo *dahdic, struct ast_format_cap *cap_slin)
static void meetme_menu_admin_extended(enum menu_modes *menu_mode, int *dtmf, struct ast_conference *conf, struct ast_flags64 *confflags, struct ast_channel *chan, struct ast_conf_user *user, char *recordingtmp, int recordingtmp_size, struct dahdi_confinfo *dahdic, struct ast_format_cap *cap_slin)
{ {
int keepplaying; int keepplaying;
int playednamerec; int playednamerec;
@ -2752,7 +2753,7 @@ static void meetme_menu_admin_extended(enum menu_modes *menu_mode, int *dtmf, st
} }
ast_channel_unlock(chan); ast_channel_unlock(chan);
if (!conf->recordingfilename) { if (!conf->recordingfilename) {
snprintf(recordingtmp, sizeof(recordingtmp), "meetme-conf-rec-%s-%s", conf->confno, ast_channel_uniqueid(chan)); snprintf(recordingtmp, recordingtmp_size, "meetme-conf-rec-%s-%s", conf->confno, ast_channel_uniqueid(chan));
conf->recordingfilename = ast_strdup(recordingtmp); conf->recordingfilename = ast_strdup(recordingtmp);
} }
if (!conf->recordingformat) { if (!conf->recordingformat) {
@ -2815,7 +2816,7 @@ static void meetme_menu_admin_extended(enum menu_modes *menu_mode, int *dtmf, st
* \param dahdic dahdi configuration info used by the main conference loop * \param dahdic dahdi configuration info used by the main conference loop
*/ */
static void meetme_menu(enum menu_modes *menu_mode, int *dtmf, struct ast_conference *conf, struct ast_flags64 *confflags, struct ast_channel *chan, struct ast_conf_user *user, char *recordingtmp, struct dahdi_confinfo *dahdic, struct ast_format_cap *cap_slin) static void meetme_menu(enum menu_modes *menu_mode, int *dtmf, struct ast_conference *conf, struct ast_flags64 *confflags, struct ast_channel *chan, struct ast_conf_user *user, char *recordingtmp, int recordingtmp_size, struct dahdi_confinfo *dahdic, struct ast_format_cap *cap_slin)
{ {
switch (*menu_mode) { switch (*menu_mode) {
case MENU_DISABLED: case MENU_DISABLED:
@ -2830,7 +2831,7 @@ static void meetme_menu(enum menu_modes *menu_mode, int *dtmf, struct ast_confer
break; break;
} }
case MENU_ADMIN_EXTENDED: case MENU_ADMIN_EXTENDED:
meetme_menu_admin_extended(menu_mode, dtmf, conf, confflags, chan, user, recordingtmp, dahdic, cap_slin); meetme_menu_admin_extended(menu_mode, dtmf, conf, confflags, chan, user, recordingtmp, recordingtmp_size, dahdic, cap_slin);
break; break;
} }
} }
@ -3973,7 +3974,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
} }
if (dtmf > 0) { if (dtmf > 0) {
meetme_menu(&menu_mode, &dtmf, conf, confflags, chan, user, recordingtmp, &dahdic, cap_slin); meetme_menu(&menu_mode, &dtmf, conf, confflags, chan, user, recordingtmp, sizeof(recordingtmp), &dahdic, cap_slin);
} }
if (musiconhold && !menu_mode) { if (musiconhold && !menu_mode) {

Write Preview
Loading…
Cancel
Save