diff options
| author | Kevin Harwell <kharwell@digium.com> | 2014-01-03 18:31:35 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2014-01-03 18:31:35 +0000 |
| commit | 0db94b70b9eb324ac25b71b67ae97555de0bb9a9 (patch) | |
| tree | a158178f17e3100b78542638ba930b8f1080d2eb /apps/app_meetme.c | |
| parent | 0ae89e7b7e52453b080e945817fe310dc0586b62 (diff) | |
app_meetme: compiler warning
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
........
Merged revisions 404773 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 404781 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4621d15b4..4651bf0eb 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2959,7 +2959,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 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 playednamerec; @@ -3080,7 +3081,7 @@ static void meetme_menu_admin_extended(enum menu_modes *menu_mode, int *dtmf, st } ast_channel_unlock(chan); 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); } if (!conf->recordingformat) { @@ -3143,7 +3144,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 */ -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) { case MENU_DISABLED: @@ -3158,7 +3159,7 @@ static void meetme_menu(enum menu_modes *menu_mode, int *dtmf, struct ast_confer break; } 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; } } @@ -4209,7 +4210,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } 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) { |