From: Kevin Harwell <kharwell@digium.com>
Date: Fri, 3 Jan 2014 18:18:22 +0000 (+0000)
Subject: chan_unistim.c, app_meetme: compiler warnings
X-Git-Tag: 1.8.26.0-rc1~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcccd11b2ee62b2bcf252425404d9b53cda039ee;p=thirdparty%2Fasterisk.git

chan_unistim.c, app_meetme: compiler warnings

Fixed a couple of compiler warnings (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. The one in
chan_unistim was issuing an array out of bounds message. Fixed both so
they would no longer issue warnings and can compile again in 'dev-mode'.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@404742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index d0fdc4bbf5..5900cca374 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2547,7 +2547,7 @@ 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)
+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)
 {
 	int keepplaying;
 	int playednamerec;
@@ -2668,7 +2668,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, chan->uniqueid);
+					snprintf(recordingtmp, recordingtmp_size, "meetme-conf-rec-%s-%s", conf->confno, chan->uniqueid);
 					conf->recordingfilename = ast_strdup(recordingtmp);
 				}
 				if (!conf->recordingformat) {
@@ -2731,7 +2731,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)
+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)
 {
 	switch (*menu_mode) {
 	case MENU_DISABLED:
@@ -2746,7 +2746,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);
+		meetme_menu_admin_extended(menu_mode, dtmf, conf, confflags, chan, user, recordingtmp, recordingtmp_size, dahdic);
 		break;
 	}
 }
@@ -3791,7 +3791,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);
+						meetme_menu(&menu_mode, &dtmf, conf, confflags, chan, user, recordingtmp, sizeof(recordingtmp), &dahdic);
 					}
 
 					if (musiconhold && !menu_mode) {
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index fa0a9cdc04..bfc6bee921 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -2693,7 +2693,7 @@ static void key_dial_page(struct unistimsession *pte, char keycode)
 	}
 	if ((keycode >= KEY_0) && (keycode <= KEY_SHARP)) {
 		char tmpbuf[] = "Number : ...............";
-		int i = 0;
+		unsigned int i = 0; /* changed to unsigned due to weird gcc 4.8.1 compiler complaint */
 
 		if (pte->device->size_phone_number >= 15)
 			return;